From 8d0d90096cf667e8280ffe9407248edfa6dd15df Mon Sep 17 00:00:00 2001
From: Sunny Shao <sunnyshao@google.com>
Date: Thu, 6 Feb 2020 17:20:58 +0800
Subject: [PATCH] Leverage the code from qt-qpr1-dev to master

Fixes: 147124412
Test: manual test

Change-Id: I6e937c6d34b635ecfdd2e29b22d0023f23f695e3
---
 res/values/config.xml                                       | 6 ++++--
 .../applications/manageapplications/ResetAppsHelper.java    | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/res/values/config.xml b/res/values/config.xml
index fc2ca1f89e1..42bc0d65038 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -416,9 +416,11 @@
     <string-array name="config_suppress_injected_tile_keys" translatable="false"/>
 
     <!-- Reset application package name -->
-    <string-array name="config_reset_app_package_name" translatable="false">
-        <item>com.android.systemui</item>
+    <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>
 
     <!-- Settings panel keeps observe this uri -->
diff --git a/src/com/android/settings/applications/manageapplications/ResetAppsHelper.java b/src/com/android/settings/applications/manageapplications/ResetAppsHelper.java
index 1fe0d01a7d8..270a5c806f2 100644
--- a/src/com/android/settings/applications/manageapplications/ResetAppsHelper.java
+++ b/src/com/android/settings/applications/manageapplications/ResetAppsHelper.java
@@ -114,7 +114,7 @@ public class ResetAppsHelper implements DialogInterface.OnClickListener,
                         PackageManager.GET_DISABLED_COMPONENTS);
                 final List<String> whiteList = Arrays.asList(
                         mContext.getResources().getStringArray(
-                                R.array.config_reset_app_package_name));
+                                R.array.config_skip_reset_apps_package_name));
 
                 for (int i = 0; i < apps.size(); i++) {
                     ApplicationInfo app = apps.get(i);