Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0700134 authored by Patrick Baumann's avatar Patrick Baumann Committed by Android (Google) Code Review
Browse files

Merge changes from topic "mIsolatedOwners-fixes" into sc-dev 

* changes:
  Check for missing values in mIsolatedOwners
  Begin watching mIsolatedOwners
parents 10813bf0 f868b7d6

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

+22 −7
Original line number Diff line number Diff line
@@ -410,6 +410,7 @@ import com.android.server.utils.Watched; 
import com.android.server.utils.WatchedArrayMap;

import com.android.server.utils.WatchedLongSparseArray;

import com.android.server.utils.WatchedSparseBooleanArray;

import com.android.server.utils.WatchedSparseIntArray;

import com.android.server.utils.Watcher;

import com.android.server.wm.ActivityTaskManagerInternal;










@@ -892,7 +893,7 @@ public class PackageManagerService extends IPackageManager.Stub













    // that created the isolated process.















    @Watched















    @GuardedBy("mLock")













    final SparseIntArray mIsolatedOwners = new SparseIntArray();













    final WatchedSparseIntArray mIsolatedOwners = new WatchedSparseIntArray();





























    /**















     * Tracks new system packages [received in an OTA] that we expect to










@@ -1795,7 +1796,7 @@ public class PackageManagerService extends IPackageManager.Stub













        public static final int SNAPPED = 2;





























        public final Settings settings;













        public final SparseIntArray isolatedOwners;













        public final WatchedSparseIntArray isolatedOwners;















        public final WatchedArrayMap<String, AndroidPackage> packages;















        public final WatchedArrayMap<String, WatchedLongSparseArray<SharedLibraryInfo>> sharedLibs;















        public final WatchedArrayMap<String, WatchedLongSparseArray<SharedLibraryInfo>> staticLibs;









@@ -1814,7 +1815,7 @@ public class PackageManagerService extends IPackageManager.Stub













        Snapshot(int type) {















            if (type == Snapshot.SNAPPED) {















                settings = mSettings.snapshot();













                isolatedOwners = mIsolatedOwners.clone();













                isolatedOwners = mIsolatedOwners.snapshot();















                packages = mPackages.snapshot();















                sharedLibs = mSharedLibraries.snapshot();















                staticLibs = mStaticLibsByDeclaringPackage.snapshot();










@@ -2016,7 +2017,7 @@ public class PackageManagerService extends IPackageManager.Stub













        // Cached attributes.  The names in this class are the same as the















        // names in PackageManagerService; see that class for documentation.















        private final Settings mSettings;













        private final SparseIntArray mIsolatedOwners;













        private final WatchedSparseIntArray mIsolatedOwners;















        private final WatchedArrayMap<String, AndroidPackage> mPackages;















        private final WatchedArrayMap<ComponentName, ParsedInstrumentation>















                mInstrumentation;










@@ -3551,7 +3552,7 @@ public class PackageManagerService extends IPackageManager.Stub













        public String getInstantAppPackageName(int callingUid) {















            // If the caller is an isolated app use the owner's uid for the lookup.















            if (Process.isIsolated(callingUid)) {













                callingUid = mIsolatedOwners.get(callingUid);













                callingUid = getIsolatedOwner(callingUid);















            }















            final int appId = UserHandle.getAppId(callingUid);















            final Object obj = mSettings.getSettingLPr(appId);









@@ -3563,6 +3564,19 @@ public class PackageManagerService extends IPackageManager.Stub













            return null;















        }



























        /**













         * Finds the owner for the provided isolated UID. Throws IllegalStateException if no such













         * isolated UID is found.













         */













        private int getIsolatedOwner(int isolatedUid) {













            final int ownerUid = mIsolatedOwners.get(isolatedUid, -1);













            if (ownerUid == -1) {













                throw new IllegalStateException(













                        "No owner UID found for isolated UID " + isolatedUid);













            }













            return ownerUid;













        }



























        public String resolveExternalPackageNameLPr(AndroidPackage pkg) {















            if (pkg.getStaticSharedLibName() != null) {















                return pkg.getManifestPackageName();










@@ -3929,7 +3943,7 @@ public class PackageManagerService extends IPackageManager.Stub













        public boolean isInstantAppInternalBody(String packageName, @UserIdInt int userId,















                int callingUid) {















            if (Process.isIsolated(callingUid)) {













                callingUid = mIsolatedOwners.get(callingUid);













                callingUid = getIsolatedOwner(callingUid);















            }















            final PackageSetting ps = mSettings.getPackageLPr(packageName);















            final boolean returnAllowed =










@@ -4083,7 +4097,7 @@ public class PackageManagerService extends IPackageManager.Stub













                @Nullable ComponentName component, @ComponentType int componentType, int userId) {















            // if we're in an isolated process, get the real calling UID















            if (Process.isIsolated(callingUid)) {













                callingUid = mIsolatedOwners.get(callingUid);













                callingUid = getIsolatedOwner(callingUid);















            }















            final String instantAppPkgName = getInstantAppPackageName(callingUid);















            final boolean callerIsInstantApp = instantAppPkgName != null;










@@ -6164,6 +6178,7 @@ public class PackageManagerService extends IPackageManager.Stub













        mAppsFilter.registerObserver(mWatcher);















        mInstantAppRegistry.registerObserver(mWatcher);















        mSettings.registerObserver(mWatcher);













        mIsolatedOwners.registerObserver(mWatcher);















        // If neither "build" attribute is true then this may be a mockito test, and verification















        // can fail as a false positive.















        Watchable.verifyWatchedAttributes(this, mWatcher, !(mIsEngBuild || mIsUserDebugBuild));