Merge "ShortcutManager: deal with changing resource IDs on app update" into nyc-mr1-dev

diff --cc services/core/java/com/android/server/pm/ShortcutService.java
index 3565154,47fb2c7..5769402
--- 1/services/core/java/com/android/server/pm/ShortcutService.java
--- 2/services/core/java/com/android/server/pm/ShortcutService.java
+++ b/services/core/java/com/android/server/pm/ShortcutService.java
@@@ -317,10 -320,12 +321,12 @@@ public class ShortcutService extends IS
          int LAUNCHER_PERMISSION_CHECK = 4;
          int CLEANUP_DANGLING_BITMAPS = 5;
          int GET_ACTIVITIES_WITH_METADATA = 6;
 -        int GET_INSTALLED_APPLICATIONS = 7;
 +        int GET_INSTALLED_PACKAGES = 7;
          int CHECK_PACKAGE_CHANGES = 8;
+         int GET_APPLICATION_RESOURCES = 9;
+         int RESOURCE_NAME_LOOKUP = 10;
  
-         int COUNT = CHECK_PACKAGE_CHANGES + 1;
+         int COUNT = RESOURCE_NAME_LOOKUP + 1;
      }
  
      final Object mStatLock = new Object();
@@@ -2626,8 -2658,10 +2672,10 @@@
                  dumpStatLS(pw, p, Stats.GET_APPLICATION_INFO, "getApplicationInfo");
                  dumpStatLS(pw, p, Stats.CLEANUP_DANGLING_BITMAPS, "cleanupDanglingBitmaps");
                  dumpStatLS(pw, p, Stats.GET_ACTIVITIES_WITH_METADATA, "getActivities+metadata");
 -                dumpStatLS(pw, p, Stats.GET_INSTALLED_APPLICATIONS, "getInstalledApplications");
 +                dumpStatLS(pw, p, Stats.GET_INSTALLED_PACKAGES, "getInstalledPackages");
                  dumpStatLS(pw, p, Stats.CHECK_PACKAGE_CHANGES, "checkPackageChanges");
+                 dumpStatLS(pw, p, Stats.GET_APPLICATION_RESOURCES, "getApplicationResources");
+                 dumpStatLS(pw, p, Stats.RESOURCE_NAME_LOOKUP, "resourceNameLookup");
              }
  
              for (int i = 0; i < mUsers.size(); i++) {

diff --cc services/tests/servicestests/src/com/android/server/pm/BaseShortcutManagerTest.java
Simple merge