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

This commit is contained in:
TreeHugger Robot
2018-08-08 00:04:41 +00:00
committed by Android (Google) Code Review

View File

@@ -21952,9 +21952,6 @@ Slog.v(TAG, ":: stepped forward, applying functor at tag " + parser.getName());
//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(
@@ -21968,7 +21965,9 @@ Slog.v(TAG, ":: stepped forward, applying functor at tag " + parser.getName());
}
for (String packageName : apkList) {
setSystemAppHiddenUntilInstalled(packageName, true);
setSystemAppInstallState(packageName, false, ActivityManager.getCurrentUser());
for (UserInfo user : sUserManager.getUsers(false)) {
setSystemAppInstallState(packageName, false, user.id);
}
}
}