Merge "Fix clearPackagePreferredActivities to check appid"

2019-01-17 19:15:31 +00:00
parent c25f58253d 5c9e6031a6
commit eb77f51bf4
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -19138,7 +19138,7 @@ public class PackageManagerService extends IPackageManager.Stub
        // writer
        synchronized (mPackages) {
            PackageParser.Package pkg = mPackages.get(packageName);
-            if (pkg == null || pkg.applicationInfo.uid != callingUid) {
+            if (pkg == null || !isCallerSameApp(packageName, callingUid)) {
                if (mContext.checkCallingOrSelfPermission(
                        android.Manifest.permission.SET_PREFERRED_APPLICATIONS)
                        != PackageManager.PERMISSION_GRANTED) {