Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Always scan the Settings app for updated shortcuts.

Browse Source 
am: ac2898228e

Change-Id: I64f476ec3b4003e87004ab6c05536f91e659d39e
This commit is contained in:
Makoto Onuki
2016-11-01 01:12:34 +00:00
committed by android-build-merger
parent 5177264735 ac2898228e
commit f0644d03a2
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/pm/ShortcutPackage.java
View File

@@ -635,7 +635,11 @@ class ShortcutPackage extends ShortcutPackageItem {
return false; // Shouldn't happen. return false; // Shouldn't happen.
} }
if (!isNewApp && !forceRescan) { // Always scan the settings app, since its version code is the same for DR and MR1.
// TODO Fix it properly: b/32554059
final boolean isSettings = "com.android.settings".equals(getPackageName());
if (!isNewApp && !forceRescan && !isSettings) {
// Return if the package hasn't changed, ie: // Return if the package hasn't changed, ie:
// - version code hasn't change // - version code hasn't change
// - lastUpdateTime hasn't change // - lastUpdateTime hasn't change
@@ -652,6 +656,11 @@ class ShortcutPackage extends ShortcutPackageItem {
return false; return false;
} }
} }
if (isSettings) {
if (ShortcutService.DEBUG) {
Slog.d(TAG, "Always scan settings.");
}
}
} finally { } finally {
s.logDurationStat(Stats.PACKAGE_UPDATE_CHECK, start); s.logDurationStat(Stats.PACKAGE_UPDATE_CHECK, start);
} }