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

Merge "Add whitelist in ResetAppsHelper"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-07-12 11:02:11 +00:00
committed by Android (Google) Code Review
parent eb97f54928 b54d2f90f2
commit 1f18ca5021
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/values/config.xml
View File

@@ -417,4 +417,9 @@
<!-- "Show work policy info" intent action. TODO(b/134391103): Replace with final SystemAPI intent when it's available. --> <!-- "Show work policy info" intent action. TODO(b/134391103): Replace with final SystemAPI intent when it's available. -->
<string name="config_work_policy_info_intent_action" translatable="false"/> <string name="config_work_policy_info_intent_action" translatable="false"/>
<!-- Reset application package name -->
<string-array name="config_reset_app_package_name" translatable="false">
<item>com.android.systemui</item>
</string-array>
</resources> </resources>

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

@@ -37,6 +37,7 @@ import androidx.appcompat.app.AlertDialog;
import com.android.settings.R; import com.android.settings.R;
import java.util.Arrays;
import java.util.List; import java.util.List;
public class ResetAppsHelper implements DialogInterface.OnClickListener, public class ResetAppsHelper implements DialogInterface.OnClickListener,
@@ -109,10 +110,17 @@ public class ResetAppsHelper implements DialogInterface.OnClickListener,
AsyncTask.execute(new Runnable() { AsyncTask.execute(new Runnable() {
@Override @Override
public void run() { public void run() {
List<ApplicationInfo> apps = mPm.getInstalledApplications( final List<ApplicationInfo> apps = mPm.getInstalledApplications(
PackageManager.GET_DISABLED_COMPONENTS); PackageManager.GET_DISABLED_COMPONENTS);
final List<String> whiteList = Arrays.asList(
mContext.getResources().getStringArray(
R.array.config_reset_app_package_name));
for (int i = 0; i < apps.size(); i++) { for (int i = 0; i < apps.size(); i++) {
ApplicationInfo app = apps.get(i); ApplicationInfo app = apps.get(i);
if (whiteList.contains(app.packageName)) {
continue;
}
try { try {
mNm.clearData(app.packageName, app.uid, false); mNm.clearData(app.packageName, app.uid, false);
} catch (android.os.RemoteException ex) { } catch (android.os.RemoteException ex) {