diff options
| -rw-r--r-- | services/core/java/com/android/server/pm/ShortcutPackage.java | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/pm/ShortcutPackage.java b/services/core/java/com/android/server/pm/ShortcutPackage.java index d558b07a7a70..38d69ed287e1 100644 --- a/services/core/java/com/android/server/pm/ShortcutPackage.java +++ b/services/core/java/com/android/server/pm/ShortcutPackage.java @@ -635,7 +635,11 @@ class ShortcutPackage extends ShortcutPackageItem { 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: // - version code hasn't change // - lastUpdateTime hasn't change @@ -652,6 +656,11 @@ class ShortcutPackage extends ShortcutPackageItem { return false; } } + if (isSettings) { + if (ShortcutService.DEBUG) { + Slog.d(TAG, "Always scan settings."); + } + } } finally { s.logDurationStat(Stats.PACKAGE_UPDATE_CHECK, start); } |