diff options
| author | Elliott Hughes <enh@google.com> | 2013-10-29 13:35:04 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-29 13:35:04 -0700 |
| commit | ed84dea928a5a830a19b5bcab7ad05a7e92f3279 (patch) | |
| tree | 3433335ce3be3a69f12b957130e95b4d19f74e3f /cmds/bootanimation | |
| parent | 2fcefe45718af44452b725b61f4051f507cb7e5d (diff) | |
| parent | 8f592378a1ea7f31d57253dc202f42707ef4da36 (diff) | |
| download | frameworks_base-ed84dea928a5a830a19b5bcab7ad05a7e92f3279.zip frameworks_base-ed84dea928a5a830a19b5bcab7ad05a7e92f3279.tar.gz frameworks_base-ed84dea928a5a830a19b5bcab7ad05a7e92f3279.tar.bz2 | |
am 8f592378: am 69920427: Merge "Fix a variety of small publicly-reported bugs."
* commit '8f592378a1ea7f31d57253dc202f42707ef4da36':
Fix a variety of small publicly-reported bugs.
Diffstat (limited to 'cmds/bootanimation')
| -rw-r--r-- | cmds/bootanimation/BootAnimation.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp index ad4e4c8..0f610e9 100644 --- a/cmds/bootanimation/BootAnimation.cpp +++ b/cmds/bootanimation/BootAnimation.cpp @@ -159,8 +159,8 @@ status_t BootAnimation::initTexture(void* buffer, size_t len) SkBitmap bitmap; SkMemoryStream stream(buffer, len); SkImageDecoder* codec = SkImageDecoder::Factory(&stream); - codec->setDitherImage(false); if (codec) { + codec->setDitherImage(false); codec->decode(&stream, &bitmap, SkBitmap::kARGB_8888_Config, SkImageDecoder::kDecodePixels_Mode); @@ -270,7 +270,7 @@ status_t BootAnimation::readyToRun() { mAndroidAnimation = true; - // If the device has encryption turned on or is in process + // If the device has encryption turned on or is in process // of being encrypted we show the encrypted boot animation. char decrypt[PROPERTY_VALUE_MAX]; property_get("vold.decrypt", decrypt, ""); |