Leverage the code from qt-qpr1-dev to master

Fixes: 147124412
Test: manual test

Change-Id: I6e937c6d34b635ecfdd2e29b22d0023f23f695e3
This commit is contained in:
Sunny Shao
2020-02-06 17:20:58 +08:00
parent cf4e12bbd9
commit 8d0d90096c
2 changed files with 5 additions and 3 deletions

View File

@@ -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 -->

View File

@@ -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);