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

Commit 648b2c0e authored by Jeongeun Song's avatar Jeongeun Song Committed by Todd Kennedy
Browse files

Add missing synchronized(mLock) blocks into PackageManagerService 

The methods whose suffixes are Lpr, LPw, and Locked should be called
within synchronized block, but it was missing. Hence, add missing
synchronized(mLock) blocks into PackageManagerService.

Bug: 162756879
Test: compile & verify basic functions working

Change-Id: Icefabfc9bb8c028edca6f5550524ea7dc1b6ffd9
parent f527b08f

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

+42 −26
Original line number Diff line number Diff line
@@ -2389,9 +2389,12 @@ public class PackageManagerService extends IPackageManager.Stub 
        final int callingUserId = UserHandle.getUserId(callingUid);















        for (String packageName : packages) {













            PackageSetting setting = mSettings.mPackages.get(packageName);













            if (setting != null













                    && !shouldFilterApplicationLocked(setting, callingUid, callingUserId)) {













            final boolean filterApp;













            synchronized (mLock) {













                final PackageSetting ps = mSettings.getPackageLPr(packageName);













                filterApp = shouldFilterApplicationLocked(ps, callingUid, callingUserId);













            }













            if (!filterApp) {















                notifyInstallObserver(packageName);















            }















        }










@@ -8946,10 +8949,10 @@ public class PackageManagerService extends IPackageManager.Stub













        if (providerInfo == null) {















            return null;















        }













        synchronized (mLock) {















            if (!mSettings.isEnabledAndMatchLPr(providerInfo, flags, userId)) {















                return null;















            }













        synchronized (mLock) {















            final PackageSetting ps = mSettings.mPackages.get(providerInfo.packageName);















            final ComponentName component =















                    new ComponentName(providerInfo.packageName, providerInfo.name);










@@ -9036,10 +9039,12 @@ public class PackageManagerService extends IPackageManager.Stub













            String targetPackage, int flags) {















        final int callingUid = Binder.getCallingUid();















        final int callingUserId = UserHandle.getUserId(callingUid);













        final PackageSetting ps = mSettings.mPackages.get(targetPackage);













        synchronized (mLock) {













            final PackageSetting ps = mSettings.getPackageLPr(targetPackage);















            if (shouldFilterApplicationLocked(ps, callingUid, callingUserId)) {















                return ParceledListSlice.emptyList();















            }













        }















        return new ParceledListSlice<>(queryInstrumentationInternal(targetPackage, flags,















                callingUserId));















    }










@@ -19462,9 +19467,11 @@ public class PackageManagerService extends IPackageManager.Stub













        mPermissionManager.enforceCrossUserPermission(callingUid, userId,















                true /* requireFullPermission */, false /* checkShell */, "clear application data");



























        final boolean filterApp;













        synchronized (mLock) {















            final PackageSetting ps = mSettings.getPackageLPr(packageName);













        final boolean filterApp =













                (ps != null && shouldFilterApplicationLocked(ps, callingUid, userId));













            filterApp = shouldFilterApplicationLocked(ps, callingUid, userId);













        }















        if (!filterApp && mProtectedPackages.isPackageDataProtected(userId, packageName)) {















            throw new SecurityException("Cannot clear data for a protected package: "















                    + packageName);










@@ -19744,12 +19751,14 @@ public class PackageManagerService extends IPackageManager.Stub













        if (mContext.checkCallingOrSelfPermission(















                android.Manifest.permission.SET_PREFERRED_APPLICATIONS)















                != PackageManager.PERMISSION_GRANTED) {













            synchronized (mLock) {















                if (getUidTargetSdkVersionLockedLPr(callingUid)















                        < Build.VERSION_CODES.FROYO) {















                    Slog.w(TAG, "Ignoring addPreferredActivity() from uid "















                            + callingUid);















                    return;















                }













            }















            mContext.enforceCallingOrSelfPermission(















                    android.Manifest.permission.SET_PREFERRED_APPLICATIONS, null);















        }










@@ -19928,8 +19937,9 @@ public class PackageManagerService extends IPackageManager.Stub













    /** This method takes a specific user id as well as UserHandle.USER_ALL. */















    private void clearPackagePreferredActivities(String packageName, int userId) {















        final SparseBooleanArray changedUsers = new SparseBooleanArray();

























        synchronized (mLock) {















            clearPackagePreferredActivitiesLPw(packageName, changedUsers, userId);













        }















        if (changedUsers.size() > 0) {















            updateDefaultHomeNotLocked(changedUsers);















            postPreferredActivityChangedBroadcast(userId);










@@ -20051,7 +20061,9 @@ public class PackageManagerService extends IPackageManager.Stub













        // writer















        try {















            final SparseBooleanArray changedUsers = new SparseBooleanArray();













            synchronized (mLock) {















                clearPackagePreferredActivitiesLPw(null, changedUsers, userId);













            }















            if (changedUsers.size() > 0) {















                postPreferredActivityChangedBroadcast(userId);















            }










@@ -21061,8 +21073,12 @@ public class PackageManagerService extends IPackageManager.Stub













        // Limit who can change which apps















        if (!UserHandle.isSameApp(callingUid, pkgSetting.appId)) {















            // Don't allow apps that don't have permission to modify other apps













            if (!allowedByPermission













                    || shouldFilterApplicationLocked(pkgSetting, callingUid, userId)) {













            final boolean filterApp;













            synchronized (mLock) {













                filterApp = (!allowedByPermission













                        || shouldFilterApplicationLocked(pkgSetting, callingUid, userId));













            }













            if (filterApp) {















                throw new SecurityException(















                        "Attempt to change component state; "















                                + "pid=" + Binder.getCallingPid()