diff options
| -rw-r--r-- | services/core/java/com/android/server/pm/PackageManagerService.java | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 00b02ffa52f6..e7e3e833d385 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -629,6 +629,7 @@ public class PackageManagerService extends IPackageManager.Stub final boolean mIsUpgrade; final boolean mIsPreNUpgrade; final boolean mIsPreNMR1Upgrade; + final boolean mIsPreQUpgrade; @GuardedBy("mPackages") private boolean mDexOptDialogShown; @@ -2399,6 +2400,7 @@ public class PackageManagerService extends IPackageManager.Stub mIsPreNUpgrade = mIsUpgrade && ver.sdkVersion < Build.VERSION_CODES.N; mIsPreNMR1Upgrade = mIsUpgrade && ver.sdkVersion < Build.VERSION_CODES.N_MR1; + mIsPreQUpgrade = mIsUpgrade && ver.sdkVersion < Build.VERSION_CODES.Q; int preUpgradeSdkVersion = ver.sdkVersion; @@ -3025,6 +3027,21 @@ public class PackageManagerService extends IPackageManager.Stub ver.fingerprint = Build.FINGERPRINT; } + // Grandfather existing (installed before Q) non-system apps to hide + // their icons in launcher. + if (!onlyCore && mIsPreQUpgrade) { + Slog.i(TAG, "Whitelisting all existing apps to hide their icons"); + int size = mSettings.mPackages.size(); + for (int i = 0; i < size; i++) { + final PackageSetting ps = mSettings.mPackages.valueAt(i); + if ((ps.pkgFlags & ApplicationInfo.FLAG_SYSTEM) != 0) { + continue; + } + ps.disableComponentLPw(PackageManager.APP_DETAILS_ACTIVITY_CLASS_NAME, + UserHandle.USER_SYSTEM); + } + } + // clear only after permissions and other defaults have been updated mExistingSystemPackages.clear(); mPromoteSystemApps = false; |