diff options
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/removed.txt | 8 | ||||
| -rw-r--r-- | core/java/android/view/WindowManager.java | 1 | ||||
| -rw-r--r-- | services/core/java/com/android/server/pm/PackageManagerService.java | 4 |
4 files changed, 13 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index 7f1648e..85d4c71 100644 --- a/api/current.txt +++ b/api/current.txt @@ -35497,7 +35497,6 @@ package android.view { field public static final int TYPE_CHANGED = 2; // 0x2 field public static final int TYPE_INPUT_METHOD = 2011; // 0x7db field public static final int TYPE_INPUT_METHOD_DIALOG = 2012; // 0x7dc - field public static final int TYPE_KEYGUARD = 2004; // 0x7d4 field public static final int TYPE_KEYGUARD_DIALOG = 2009; // 0x7d9 field public static final int TYPE_PHONE = 2002; // 0x7d2 field public static final int TYPE_PRIORITY_PHONE = 2007; // 0x7d7 diff --git a/api/removed.txt b/api/removed.txt index 458c422..465a18d 100644 --- a/api/removed.txt +++ b/api/removed.txt @@ -6,3 +6,11 @@ package android.media { } +package android.view { + + public static class WindowManager.LayoutParams extends android.view.ViewGroup.LayoutParams implements android.os.Parcelable { + field public static final int TYPE_KEYGUARD = 2004; // 0x7d4 + } + +} + diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java index 034778f..597d2dd 100644 --- a/core/java/android/view/WindowManager.java +++ b/core/java/android/view/WindowManager.java @@ -346,6 +346,7 @@ public interface WindowManager extends ViewManager { /** * Window type: keyguard window. * In multiuser systems shows on all users' windows. + * @removed */ public static final int TYPE_KEYGUARD = FIRST_SYSTEM_WINDOW+4; diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 68ae6ff..ee6d4d0 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -5486,9 +5486,11 @@ public class PackageManagerService extends IPackageManager.Stub { // SDK tools. We must scan their APKs for renderscript bitcode and // not launch them if it's present. Don't bother checking on devices // that don't have 64 bit support. + boolean needsRenderScriptOverride = false; if (Build.SUPPORTED_64_BIT_ABIS.length > 0 && abiOverride == null && NativeLibraryHelper.hasRenderscriptBitcode(handle)) { abiList = Build.SUPPORTED_32_BIT_ABIS; + needsRenderScriptOverride = true; } final int copyRet; @@ -5508,6 +5510,8 @@ public class PackageManagerService extends IPackageManager.Stub { pkg.applicationInfo.primaryCpuAbi = abiList[copyRet]; } else if (copyRet == PackageManager.NO_NATIVE_LIBRARIES && abiOverride != null) { pkg.applicationInfo.primaryCpuAbi = abiOverride; + } else if (needsRenderScriptOverride) { + pkg.applicationInfo.primaryCpuAbi = abiList[0]; } } } catch (IOException ioe) { |