From 72a50878fec23511cd0e9ac1fa2f8076e8497dfc Mon Sep 17 00:00:00 2001 From: Patrick Baumann Date: Tue, 28 May 2019 15:20:15 -0700 Subject: Fix install flag overlap When INSTALL_ALL_WHITELIST_RESTRICTED_PERMISSIONS was added, its value conflicted with iINSTALL_FORCE_VOLUME_UUID. A subsequent change added INSTALL_ALL_WHITELIST_RESTRICTED_PERMISSIONS to all adb install requests, resulting in all adb installs being force UUID installs and thus breaking adoptable storage CTS. This change fixes that overlap. Fixes: 133215060 Test: atest android.appsecurity.cts.AdoptableHostTest#testPackageInstaller Change-Id: I8fbfcc0eea4f4447e4a446fe188b6edfc9cec0f6 --- core/java/android/content/pm/PackageManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index b09eada27ce4..cb939f05ffc5 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -807,7 +807,7 @@ public abstract class PackageManager { * * @hide */ - public static final int INSTALL_ALL_WHITELIST_RESTRICTED_PERMISSIONS = 0x00000200; + public static final int INSTALL_ALL_WHITELIST_RESTRICTED_PERMISSIONS = 0x00400000; /** {@hide} */ public static final int INSTALL_FORCE_VOLUME_UUID = 0x00000200; -- cgit v1.2.3-59-g8ed1b