Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e92684e authored by Ruchi Kandoi's avatar Ruchi Kandoi Committed by android-build-merger
Browse files

Merge "Fix to mark disableApkUnlessMatchedSku hidden for all users" into pi-dev am: fd245851 

am: 312f37ee

Change-Id: Ia2576a987ffb331fd6c3d10fec6d87cb0d122b45
parents fffaf4f1 312f37ee

services/core/java/com/android/server/pm/PackageManagerService.java

+3 −4
Original line number Diff line number Diff line
@@ -22064,9 +22064,6 @@ public class PackageManagerService extends IPackageManager.Stub 














    //TODO: b/111402650















    private void disableSkuSpecificApps() {













        if (!mIsUpgrade && !mFirstBoot) {













            return;













        }















        String apkList[] = mContext.getResources().getStringArray(















                R.array.config_disableApksUnlessMatchedSku_apk_list);















        String skuArray[] = mContext.getResources().getStringArray(









@@ -22080,7 +22077,9 @@ public class PackageManagerService extends IPackageManager.Stub













        }















        for (String packageName : apkList) {















            setSystemAppHiddenUntilInstalled(packageName, true);













            setSystemAppInstallState(packageName, false, ActivityManager.getCurrentUser());













            for (UserInfo user : sUserManager.getUsers(false)) {













                setSystemAppInstallState(packageName, false, user.id);













            }















        }















    }