Snap for 6188276 from 74ded43527 to qt-qpr3-release

Change-Id: I264c1faafd174a36d91a8ee8158fae57b0241db5
This commit is contained in:
android-build-team Robot
2020-02-07 02:29:04 +00:00
2 changed files with 16 additions and 1 deletions

View File

@@ -424,4 +424,11 @@
<!-- Package name of dialer supports RTT setting-->
<string name="config_rtt_setting_package_name" translatable="false"></string>
<!-- Reset application package name -->
<string-array name="config_skip_reset_apps_package_name" translatable="false">
<item>android</item>
<item>com.android.providers.downloads</item>
<item>com.android.systemui</item>
<item>com.android.vending</item>
</string-array>
</resources>

View File

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