diff options
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/app_process/app_main.cpp | 29 | ||||
| -rw-r--r-- | cmds/bootanimation/BootAnimation.cpp | 4 |
2 files changed, 2 insertions, 31 deletions
diff --git a/cmds/app_process/app_main.cpp b/cmds/app_process/app_main.cpp index 28752a5..8d2b739 100644 --- a/cmds/app_process/app_main.cpp +++ b/cmds/app_process/app_main.cpp @@ -7,7 +7,6 @@ #define LOG_TAG "appproc" -#include <cutils/properties.h> #include <binder/IPCThreadState.h> #include <binder/ProcessState.h> #include <utils/Log.h> @@ -15,7 +14,6 @@ #include <cutils/memory.h> #include <cutils/trace.h> #include <android_runtime/AndroidRuntime.h> -#include <sys/personality.h> #include <stdlib.h> #include <stdio.h> @@ -137,33 +135,6 @@ static void setArgv0(const char *argv0, const char *newArgv0) int main(int argc, char* const argv[]) { -#ifdef __arm__ - /* - * b/7188322 - Temporarily revert to the compat memory layout - * to avoid breaking third party apps. - * - * THIS WILL GO AWAY IN A FUTURE ANDROID RELEASE. - * - * http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=7dbaa466 - * changes the kernel mapping from bottom up to top-down. - * This breaks some programs which improperly embed - * an out of date copy of Android's linker. - */ - char value[PROPERTY_VALUE_MAX]; - property_get("ro.kernel.qemu", value, ""); - bool is_qemu = (strcmp(value, "1") == 0); - if ((getenv("NO_ADDR_COMPAT_LAYOUT_FIXUP") == NULL) && !is_qemu) { - int current = personality(0xFFFFFFFF); - if ((current & ADDR_COMPAT_LAYOUT) == 0) { - personality(current | ADDR_COMPAT_LAYOUT); - setenv("NO_ADDR_COMPAT_LAYOUT_FIXUP", "1", 1); - execv("/system/bin/app_process", argv); - return -1; - } - } - unsetenv("NO_ADDR_COMPAT_LAYOUT_FIXUP"); -#endif - // These are global variables in ProcessState.cpp mArgC = argc; mArgV = argv; 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, ""); |