diff options
| author | John Reck <jreck@google.com> | 2015-08-03 22:50:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-03 22:50:25 +0000 |
| commit | 7290d93df99de9d21ac8a9ddf72bc095b319af4b (patch) | |
| tree | 694fb112d23f89848cdd4c424f11563ce72a0c51 /core/jni | |
| parent | 0faca96f939b8530e5387a30e317d852f39f689f (diff) | |
| parent | 01a0af31d7d418f400ce5d3f752eba6a35aa00e2 (diff) | |
| download | frameworks_base-7290d93df99de9d21ac8a9ddf72bc095b319af4b.zip frameworks_base-7290d93df99de9d21ac8a9ddf72bc095b319af4b.tar.gz frameworks_base-7290d93df99de9d21ac8a9ddf72bc095b319af4b.tar.bz2 | |
Merge "Yell loudly about undefined behind in Bitmap, but work anyway" into mnc-dev
Diffstat (limited to 'core/jni')
| -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(); } |