PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix reset app preferences for work profile apps" into tm-dev am: 51204e3deb

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234983

Change-Id: I4875344328bc68d8ca069ed15f71aa8ce4abef8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yanting Yang
2022-05-10 20:33:30 +00:00
committed by Automerger Merge Worker
parent d77f3426a2 51204e3deb
commit 799f7218cd
1 changed files with 31 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/com/android/settings/applications/manageapplications/ResetAppsHelper.java
View File

@@ -32,6 +32,8 @@ import android.os.Bundle;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.ServiceManager; import android.os.ServiceManager;
import android.os.UserHandle; import android.os.UserHandle;
import android.os.UserManager;
import android.util.Log;
import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
@@ -44,6 +46,7 @@ public class ResetAppsHelper implements DialogInterface.OnClickListener,
DialogInterface.OnDismissListener { DialogInterface.OnDismissListener {
private static final String EXTRA_RESET_DIALOG = "resetDialog"; private static final String EXTRA_RESET_DIALOG = "resetDialog";
private static final String TAG = "ResetAppsHelper";
private final PackageManager mPm; private final PackageManager mPm;
private final IPackageManager mIPm; private final IPackageManager mIPm;
@@ -51,6 +54,7 @@ public class ResetAppsHelper implements DialogInterface.OnClickListener,
private final NetworkPolicyManager mNpm; private final NetworkPolicyManager mNpm;
private final AppOpsManager mAom; private final AppOpsManager mAom;
private final Context mContext; private final Context mContext;
private final UserManager mUm;
private AlertDialog mResetDialog; private AlertDialog mResetDialog;
@@ -62,6 +66,7 @@ public class ResetAppsHelper implements DialogInterface.OnClickListener,
ServiceManager.getService(Context.NOTIFICATION_SERVICE)); ServiceManager.getService(Context.NOTIFICATION_SERVICE));
mNpm = NetworkPolicyManager.from(context); mNpm = NetworkPolicyManager.from(context);
mAom = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE); mAom = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
mUm = (UserManager) context.getSystemService(Context.USER_SERVICE);
} }
public void onRestoreInstanceState(Bundle savedInstanceState) { public void onRestoreInstanceState(Bundle savedInstanceState) {
@@ -110,27 +115,35 @@ public class ResetAppsHelper implements DialogInterface.OnClickListener,
AsyncTask.execute(new Runnable() { AsyncTask.execute(new Runnable() {
@Override @Override
public void run() { public void run() {
final List<ApplicationInfo> apps = mPm.getInstalledApplications(
PackageManager.GET_DISABLED_COMPONENTS);
final List<String> allowList = Arrays.asList( final List<String> allowList = Arrays.asList(
mContext.getResources().getStringArray( mContext.getResources().getStringArray(
R.array.config_skip_reset_apps_package_name)); R.array.config_skip_reset_apps_package_name));
for (UserHandle userHandle : mUm.getEnabledProfiles()) {
for (int i = 0; i < apps.size(); i++) { final int userId = userHandle.getIdentifier();
ApplicationInfo app = apps.get(i); final List<ApplicationInfo> apps = mPm.getInstalledApplicationsAsUser(
if (allowList.contains(app.packageName)) { PackageManager.GET_DISABLED_COMPONENTS, userId);
continue; for (int i = 0; i < apps.size(); i++) {
} ApplicationInfo app = apps.get(i);
try { if (allowList.contains(app.packageName)) {
mNm.clearData(app.packageName, app.uid, false); continue;
} catch (android.os.RemoteException ex) { }
} try {
if (!app.enabled) { mNm.clearData(app.packageName, app.uid, false);
if (mPm.getApplicationEnabledSetting(app.packageName) } catch (android.os.RemoteException ex) {
== PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER) { }
mPm.setApplicationEnabledSetting(app.packageName, if (!app.enabled) {
PackageManager.COMPONENT_ENABLED_STATE_DEFAULT, try {
PackageManager.DONT_KILL_APP); if (mIPm.getApplicationEnabledSetting(app.packageName, userId)
== PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER) {
mIPm.setApplicationEnabledSetting(app.packageName,
PackageManager.COMPONENT_ENABLED_STATE_DEFAULT,
PackageManager.DONT_KILL_APP,
userId,
mContext.getPackageName());
}
} catch (RemoteException e) {
Log.e(TAG, "Error during reset disabled apps.", e);
}
} }
} }
} }