diff options
| author | John Reck <jreck@google.com> | 2015-08-04 01:00:04 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-04 01:00:04 +0000 |
| commit | 649c3c440e97f94971f5f2c8c4b08338c785c582 (patch) | |
| tree | 7076aa8a1fa743011f9cef233ad1432a0f0c7f31 /core | |
| parent | d4842c374ab8f5578c8faca5a7e3f8d90bd7fab3 (diff) | |
| parent | 7290d93df99de9d21ac8a9ddf72bc095b319af4b (diff) | |
| download | frameworks_base-649c3c440e97f94971f5f2c8c4b08338c785c582.zip frameworks_base-649c3c440e97f94971f5f2c8c4b08338c785c582.tar.gz frameworks_base-649c3c440e97f94971f5f2c8c4b08338c785c582.tar.bz2 | |
am 7290d93d: Merge "Yell loudly about undefined behind in Bitmap, but work anyway" into mnc-dev
* commit '7290d93df99de9d21ac8a9ddf72bc095b319af4b':
Yell loudly about undefined behind in Bitmap, but work anyway
Diffstat (limited to 'core')
| -rwxr-xr-x | core/jni/android/graphics/Bitmap.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/core/jni/android/graphics/Bitmap.cpp b/core/jni/android/graphics/Bitmap.cpp index 670d3c0..fbe3ece 100755 --- a/core/jni/android/graphics/Bitmap.cpp +++ b/core/jni/android/graphics/Bitmap.cpp @@ -218,7 +218,6 @@ int Bitmap::getAshmemFd() const { } const SkImageInfo& Bitmap::info() const { - assertValid(); return mPixelRef->info(); } |