Merge "Add internal implementation for notifyPackageUse" into oc-mr1-dev

core/java/android/content/pm/PackageManagerInternal.java

@@ -378,4 +378,9 @@ public abstract class PackageManagerInternal {
      * associated with an instant app. It may be kept after the instant app has been uninstalled.
      */
     public abstract boolean hasInstantApplicationMetadata(String packageName, int userId);
+
+    /**
+     * Updates a package last used time.
+     */
+    public abstract void notifyPackageUse(String packageName, int reason);
 }

services/core/java/com/android/server/am/ActivityManagerService.java

@@ -3588,10 +3588,8 @@ public class ActivityManagerService extends IActivityManager.Stub
     }
 
     void notifyPackageUse(String packageName, int reason) {
-        IPackageManager pm = AppGlobals.getPackageManager();
+        synchronized(this) {
-        try {
+            getPackageManagerInternalLocked().notifyPackageUse(packageName, reason);
-            pm.notifyPackageUse(packageName, reason);
-        } catch (RemoteException e) {
         }
     }
 

services/core/java/com/android/server/pm/PackageManagerService.java

@@ -9844,13 +9844,17 @@ public class PackageManagerService extends IPackageManager.Stub
                     return;
                 }
             }
+            notifyPackageUseLocked(packageName, reason);
+        }
+    }
+
+    private void notifyPackageUseLocked(String packageName, int reason) {
         final PackageParser.Package p = mPackages.get(packageName);
         if (p == null) {
             return;
         }
         p.mLastPackageUsageTimeInMills[reason] = System.currentTimeMillis();
     }
-    }
 
     @Override
     public void notifyDexLoad(String loadingPackageName, List<String> classLoaderNames,
@@ -25502,6 +25506,13 @@ Slog.v(TAG, ":: stepped forward, applying functor at tag " + parser.getName());
                 return mInstantAppRegistry.hasInstantApplicationMetadataLPr(packageName, userId);
             }
         }
+
+        @Override
+        public void notifyPackageUse(String packageName, int reason) {
+            synchronized (mPackages) {
+                PackageManagerService.this.notifyPackageUseLocked(packageName, reason);
+            }
+        }
     }
 
     @Override