Merge "Protect usage data with OP_GET_USAGE_STATS." into pi-dev

diff --combined services/core/java/com/android/server/pm/PackageManagerService.java
index 9fce12c,19241a3..a200231
--- 1/services/core/java/com/android/server/pm/PackageManagerService.java
--- 2/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@@ -2462,7 -2462,7 +2462,7 @@@ public class PackageManagerService exte
                  installer, mInstallLock);
          mDexManager = new DexManager(this, mPackageDexOptimizer, installer, mInstallLock,
                  dexManagerListener);
-         mArtManagerService = new ArtManagerService(this, installer, mInstallLock);
+         mArtManagerService = new ArtManagerService(mContext, this, installer, mInstallLock);
          mMoveCallbacks = new MoveCallbacks(FgThread.get().getLooper());
  
          mOnPermissionChangeListeners = new OnPermissionChangeListeners(
@@@ -23603,8 -23603,7 +23603,8 @@@ Slog.v(TAG, ":: stepped forward, applyi
  
          private SigningDetails getSigningDetails(int uid) {
              synchronized (mPackages) {
 -                final Object obj = mSettings.getUserIdLPr(uid);
 +                final int appId = UserHandle.getAppId(uid);
 +                final Object obj = mSettings.getUserIdLPr(appId);
                  if (obj != null) {
                      if (obj instanceof SharedUserSetting) {
                          return ((SharedUserSetting) obj).signatures.mSigningDetails;