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

Commit 517ba168 authored by Alan Stokes's avatar Alan Stokes
Browse files

Remove cookie parameter from updateFlags*. 

It was originally used for debugging, but has been redundant for a
while.

Test: Still builds
Change-Id: I2d6c24e4a28de91abbc088c02be3ce82267f9dd8
parent 07ae3bec

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

+33 −41
Original line number Original line Diff line number Diff line
@@ -4037,7 +4037,7 @@ public class PackageManagerService extends IPackageManager.Stub 
    private PackageInfo getPackageInfoInternal(String packageName, long versionCode,

    private PackageInfo getPackageInfoInternal(String packageName, long versionCode,

            int flags, int filterCallingUid, int userId) {

            int flags, int filterCallingUid, int userId) {

        if (!mUserManager.exists(userId)) return null;

        if (!mUserManager.exists(userId)) return null;

        flags = updateFlagsForPackage(flags, userId, packageName);

        flags = updateFlagsForPackage(flags, userId);

        mPermissionManager.enforceCrossUserPermission(Binder.getCallingUid(), userId,

        mPermissionManager.enforceCrossUserPermission(Binder.getCallingUid(), userId,

                false /* requireFullPermission */, false /* checkShell */, "get package info");

                false /* requireFullPermission */, false /* checkShell */, "get package info");
















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









    public int getPackageUid(String packageName, int flags, int userId) {







    public int getPackageUid(String packageName, int flags, int userId) {











        if (!mUserManager.exists(userId)) return -1;







        if (!mUserManager.exists(userId)) return -1;











        final int callingUid = Binder.getCallingUid();







        final int callingUid = Binder.getCallingUid();











        flags = updateFlagsForPackage(flags, userId, packageName);







        flags = updateFlagsForPackage(flags, userId);











        mPermissionManager.enforceCrossUserPermission(callingUid, userId,







        mPermissionManager.enforceCrossUserPermission(callingUid, userId,











                false /*requireFullPermission*/, false /*checkShell*/, "getPackageUid");







                false /*requireFullPermission*/, false /*checkShell*/, "getPackageUid");


























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









    public int[] getPackageGids(String packageName, int flags, int userId) {







    public int[] getPackageGids(String packageName, int flags, int userId) {











        if (!mUserManager.exists(userId)) return null;







        if (!mUserManager.exists(userId)) return null;











        final int callingUid = Binder.getCallingUid();







        final int callingUid = Binder.getCallingUid();











        flags = updateFlagsForPackage(flags, userId, packageName);







        flags = updateFlagsForPackage(flags, userId);











        mPermissionManager.enforceCrossUserPermission(callingUid, userId,







        mPermissionManager.enforceCrossUserPermission(callingUid, userId,











                false /*requireFullPermission*/, false /*checkShell*/, "getPackageGids");







                false /*requireFullPermission*/, false /*checkShell*/, "getPackageGids");


























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









    private ApplicationInfo getApplicationInfoInternal(String packageName, int flags,







    private ApplicationInfo getApplicationInfoInternal(String packageName, int flags,











            int filterCallingUid, int userId) {







            int filterCallingUid, int userId) {











        if (!mUserManager.exists(userId)) return null;







        if (!mUserManager.exists(userId)) return null;











        flags = updateFlagsForApplication(flags, userId, packageName);







        flags = updateFlagsForApplication(flags, userId);



























        if (!isRecentsAccessingChildProfiles(Binder.getCallingUid(), userId)) {







        if (!isRecentsAccessingChildProfiles(Binder.getCallingUid(), userId)) {











            mPermissionManager.enforceCrossUserPermission(Binder.getCallingUid(), userId,







            mPermissionManager.enforceCrossUserPermission(Binder.getCallingUid(), userId,










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









    /**







    /**











     * Update given flags when being used to request {@link PackageInfo}.







     * Update given flags when being used to request {@link PackageInfo}.











     */







     */











    private int updateFlagsForPackage(int flags, int userId, Object cookie) {







    private int updateFlagsForPackage(int flags, int userId) {











        final boolean isCallerSystemUser = UserHandle.getCallingUserId() == UserHandle.USER_SYSTEM;







        final boolean isCallerSystemUser = UserHandle.getCallingUserId() == UserHandle.USER_SYSTEM;











        if ((flags & PackageManager.MATCH_ANY_USER) != 0) {







        if ((flags & PackageManager.MATCH_ANY_USER) != 0) {











            // require the permission to be held; the calling uid and given user id referring







            // require the permission to be held; the calling uid and given user id referring









@@ -4762,14 +4762,14 @@ public class PackageManagerService extends IPackageManager.Stub









    /**







    /**











     * Update given flags when being used to request {@link ApplicationInfo}.







     * Update given flags when being used to request {@link ApplicationInfo}.











     */







     */











    private int updateFlagsForApplication(int flags, int userId, Object cookie) {







    private int updateFlagsForApplication(int flags, int userId) {











        return updateFlagsForPackage(flags, userId, cookie);







        return updateFlagsForPackage(flags, userId);











    }







    }



























    /**







    /**











     * Update given flags when being used to request {@link ComponentInfo}.







     * Update given flags when being used to request {@link ComponentInfo}.











     */







     */











    private int updateFlagsForComponent(int flags, int userId, Object cookie) {







    private int updateFlagsForComponent(int flags, int userId) {











        return updateFlags(flags, userId);







        return updateFlags(flags, userId);











    }







    }


























@@ -4798,16 +4798,12 @@ public class PackageManagerService extends IPackageManager.Stub









     * action and a {@code android.intent.category.BROWSABLE} category</li>







     * action and a {@code android.intent.category.BROWSABLE} category</li>











     * </ul>







     * </ul>











     */







     */











    int updateFlagsForResolve(int flags, int userId, Intent intent, int callingUid) {







    int updateFlagsForResolve(int flags, int userId, int callingUid, boolean wantInstantApps) {











        return updateFlagsForResolve(flags, userId, intent, callingUid,







        return updateFlagsForResolve(flags, userId, callingUid,











                false /*wantInstantApps*/, false /*onlyExposedExplicitly*/);














    }














    int updateFlagsForResolve(int flags, int userId, Intent intent, int callingUid,














            boolean wantInstantApps) {














        return updateFlagsForResolve(flags, userId, intent, callingUid,














                wantInstantApps, false /*onlyExposedExplicitly*/);







                wantInstantApps, false /*onlyExposedExplicitly*/);











    }







    }











    int updateFlagsForResolve(int flags, int userId, Intent intent, int callingUid,




















    int updateFlagsForResolve(int flags, int userId, int callingUid,











            boolean wantInstantApps, boolean onlyExposedExplicitly) {







            boolean wantInstantApps, boolean onlyExposedExplicitly) {











        // Safe mode means we shouldn't match any third-party components







        // Safe mode means we shouldn't match any third-party components











        if (mSafeMode) {







        if (mSafeMode) {









@@ -4830,7 +4826,7 @@ public class PackageManagerService extends IPackageManager.Stub









                flags &= ~PackageManager.MATCH_INSTANT;







                flags &= ~PackageManager.MATCH_INSTANT;











            }







            }











        }







        }











        return updateFlagsForComponent(flags, userId, intent /*cookie*/);







        return updateFlagsForComponent(flags, userId);











    }







    }



























    @Override







    @Override









@@ -4847,7 +4843,7 @@ public class PackageManagerService extends IPackageManager.Stub









    private ActivityInfo getActivityInfoInternal(ComponentName component, int flags,







    private ActivityInfo getActivityInfoInternal(ComponentName component, int flags,











            int filterCallingUid, int userId) {







            int filterCallingUid, int userId) {











        if (!mUserManager.exists(userId)) return null;







        if (!mUserManager.exists(userId)) return null;











        flags = updateFlagsForComponent(flags, userId, component);







        flags = updateFlagsForComponent(flags, userId);



























        if (!isRecentsAccessingChildProfiles(Binder.getCallingUid(), userId)) {







        if (!isRecentsAccessingChildProfiles(Binder.getCallingUid(), userId)) {











            mPermissionManager.enforceCrossUserPermission(Binder.getCallingUid(), userId,







            mPermissionManager.enforceCrossUserPermission(Binder.getCallingUid(), userId,










@@ -4928,7 +4924,7 @@ public class PackageManagerService extends IPackageManager.Stub









    public ActivityInfo getReceiverInfo(ComponentName component, int flags, int userId) {







    public ActivityInfo getReceiverInfo(ComponentName component, int flags, int userId) {











        if (!mUserManager.exists(userId)) return null;







        if (!mUserManager.exists(userId)) return null;











        final int callingUid = Binder.getCallingUid();







        final int callingUid = Binder.getCallingUid();











        flags = updateFlagsForComponent(flags, userId, component);







        flags = updateFlagsForComponent(flags, userId);











        mPermissionManager.enforceCrossUserPermission(callingUid, userId,







        mPermissionManager.enforceCrossUserPermission(callingUid, userId,











                false /* requireFullPermission */, false /* checkShell */, "get receiver info");







                false /* requireFullPermission */, false /* checkShell */, "get receiver info");











        synchronized (mLock) {







        synchronized (mLock) {










@@ -4958,7 +4954,7 @@ public class PackageManagerService extends IPackageManager.Stub









            return null;







            return null;











        }







        }



























        flags = updateFlagsForPackage(flags, userId, null);







        flags = updateFlagsForPackage(flags, userId);



























        final boolean canSeeStaticLibraries =







        final boolean canSeeStaticLibraries =











                mContext.checkCallingOrSelfPermission(INSTALL_PACKAGES)







                mContext.checkCallingOrSelfPermission(INSTALL_PACKAGES)










@@ -5143,7 +5139,7 @@ public class PackageManagerService extends IPackageManager.Stub









    public ServiceInfo getServiceInfo(ComponentName component, int flags, int userId) {







    public ServiceInfo getServiceInfo(ComponentName component, int flags, int userId) {











        if (!mUserManager.exists(userId)) return null;







        if (!mUserManager.exists(userId)) return null;











        final int callingUid = Binder.getCallingUid();







        final int callingUid = Binder.getCallingUid();











        flags = updateFlagsForComponent(flags, userId, component);







        flags = updateFlagsForComponent(flags, userId);











        mPermissionManager.enforceCrossUserPermission(callingUid, userId,







        mPermissionManager.enforceCrossUserPermission(callingUid, userId,











                false /* requireFullPermission */, false /* checkShell */, "get service info");







                false /* requireFullPermission */, false /* checkShell */, "get service info");











        synchronized (mLock) {







        synchronized (mLock) {









@@ -5168,7 +5164,7 @@ public class PackageManagerService extends IPackageManager.Stub









    public ProviderInfo getProviderInfo(ComponentName component, int flags, int userId) {







    public ProviderInfo getProviderInfo(ComponentName component, int flags, int userId) {











        if (!mUserManager.exists(userId)) return null;







        if (!mUserManager.exists(userId)) return null;











        final int callingUid = Binder.getCallingUid();







        final int callingUid = Binder.getCallingUid();











        flags = updateFlagsForComponent(flags, userId, component);







        flags = updateFlagsForComponent(flags, userId);











        mPermissionManager.enforceCrossUserPermission(callingUid, userId,







        mPermissionManager.enforceCrossUserPermission(callingUid, userId,











                false /* requireFullPermission */, false /* checkShell */, "get provider info");







                false /* requireFullPermission */, false /* checkShell */, "get provider info");











        synchronized (mLock) {







        synchronized (mLock) {










@@ -5868,7 +5864,7 @@ public class PackageManagerService extends IPackageManager.Stub

























            if (!mUserManager.exists(userId)) return null;







            if (!mUserManager.exists(userId)) return null;











            final int callingUid = Binder.getCallingUid();







            final int callingUid = Binder.getCallingUid();











            flags = updateFlagsForResolve(flags, userId, intent, filterCallingUid, resolveForStart);







            flags = updateFlagsForResolve(flags, userId, filterCallingUid, resolveForStart);











            mPermissionManager.enforceCrossUserPermission(callingUid, userId,







            mPermissionManager.enforceCrossUserPermission(callingUid, userId,











                    false /*requireFullPermission*/, false /*checkShell*/, "resolve intent");







                    false /*requireFullPermission*/, false /*checkShell*/, "resolve intent");


























@@ -5898,7 +5894,7 @@ public class PackageManagerService extends IPackageManager.Stub









        intent = updateIntentForResolve(intent);







        intent = updateIntentForResolve(intent);











        final String resolvedType = intent.resolveTypeIfNeeded(mContext.getContentResolver());







        final String resolvedType = intent.resolveTypeIfNeeded(mContext.getContentResolver());











        final int flags = updateFlagsForResolve(







        final int flags = updateFlagsForResolve(











                0, userId, intent, callingUid, false /*includeInstantApps*/);







                0, userId, callingUid, false /*includeInstantApps*/);











        final List<ResolveInfo> query = queryIntentActivitiesInternal(intent, resolvedType, flags,







        final List<ResolveInfo> query = queryIntentActivitiesInternal(intent, resolvedType, flags,











                userId);







                userId);











        synchronized (mLock) {







        synchronized (mLock) {










@@ -6212,7 +6208,7 @@ public class PackageManagerService extends IPackageManager.Stub









                android.provider.Settings.Global.getInt(mContext.getContentResolver(),







                android.provider.Settings.Global.getInt(mContext.getContentResolver(),











                        android.provider.Settings.Global.DEVICE_PROVISIONED, 0) == 1;







                        android.provider.Settings.Global.DEVICE_PROVISIONED, 0) == 1;











        flags = updateFlagsForResolve(







        flags = updateFlagsForResolve(











                flags, userId, intent, callingUid, false /*includeInstantApps*/);







                flags, userId, callingUid, false /*includeInstantApps*/);











        intent = updateIntentForResolve(intent);







        intent = updateIntentForResolve(intent);











        // writer







        // writer











        synchronized (mLock) {







        synchronized (mLock) {










@@ -6420,7 +6416,7 @@ public class PackageManagerService extends IPackageManager.Stub









            final int callingUid = Binder.getCallingUid();







            final int callingUid = Binder.getCallingUid();











            final UserInfo parent = getProfileParent(sourceUserId);







            final UserInfo parent = getProfileParent(sourceUserId);











            synchronized (mLock) {







            synchronized (mLock) {











                int flags = updateFlagsForResolve(0, parent.id, intent, callingUid,







                int flags = updateFlagsForResolve(0, parent.id, callingUid,











                        false /*includeInstantApps*/);







                        false /*includeInstantApps*/);











                CrossProfileDomainInfo xpDomainInfo = getCrossProfileDomainPreferredLpr(







                CrossProfileDomainInfo xpDomainInfo = getCrossProfileDomainPreferredLpr(











                        intent, resolvedType, flags, sourceUserId, parent.id);







                        intent, resolvedType, flags, sourceUserId, parent.id);










@@ -6506,7 +6502,7 @@ public class PackageManagerService extends IPackageManager.Stub









            }







            }











        }







        }



























        flags = updateFlagsForResolve(flags, userId, intent, filterCallingUid, resolveForStart,







        flags = updateFlagsForResolve(flags, userId, filterCallingUid, resolveForStart,











                comp != null || pkgName != null /*onlyExposedExplicitly*/);







                comp != null || pkgName != null /*onlyExposedExplicitly*/);











        if (comp != null) {







        if (comp != null) {











            final List<ResolveInfo> list = new ArrayList<>(1);







            final List<ResolveInfo> list = new ArrayList<>(1);










@@ -7273,8 +7269,7 @@ public class PackageManagerService extends IPackageManager.Stub









            String resolvedType, int flags, int userId) {







            String resolvedType, int flags, int userId) {











        if (!mUserManager.exists(userId)) return Collections.emptyList();







        if (!mUserManager.exists(userId)) return Collections.emptyList();











        final int callingUid = Binder.getCallingUid();







        final int callingUid = Binder.getCallingUid();











        flags = updateFlagsForResolve(flags, userId, intent, callingUid,







        flags = updateFlagsForResolve(flags, userId, callingUid, false /*includeInstantApps*/);











                false /*includeInstantApps*/);














        mPermissionManager.enforceCrossUserPermission(callingUid, userId,







        mPermissionManager.enforceCrossUserPermission(callingUid, userId,











                false /*requireFullPermission*/, false /*checkShell*/,







                false /*requireFullPermission*/, false /*checkShell*/,











                "query intent activity options");







                "query intent activity options");










@@ -7460,8 +7455,7 @@ public class PackageManagerService extends IPackageManager.Stub









                false /*requireFullPermission*/, false /*checkShell*/,







                false /*requireFullPermission*/, false /*checkShell*/,











                "query intent receivers");







                "query intent receivers");











        final String instantAppPkgName = getInstantAppPackageName(callingUid);







        final String instantAppPkgName = getInstantAppPackageName(callingUid);











        flags = updateFlagsForResolve(flags, userId, intent, callingUid,







        flags = updateFlagsForResolve(flags, userId, callingUid, false /*includeInstantApps*/);











                false /*includeInstantApps*/);














        ComponentName comp = intent.getComponent();







        ComponentName comp = intent.getComponent();











        if (comp == null) {







        if (comp == null) {











            if (intent.getSelector() != null) {







            if (intent.getSelector() != null) {










@@ -7551,8 +7545,7 @@ public class PackageManagerService extends IPackageManager.Stub









    private ResolveInfo resolveServiceInternal(Intent intent, String resolvedType, int flags,







    private ResolveInfo resolveServiceInternal(Intent intent, String resolvedType, int flags,











            int userId, int callingUid) {







            int userId, int callingUid) {











        if (!mUserManager.exists(userId)) return null;







        if (!mUserManager.exists(userId)) return null;











        flags = updateFlagsForResolve(







        flags = updateFlagsForResolve(flags, userId, callingUid, false /*includeInstantApps*/);











                flags, userId, intent, callingUid, false /*includeInstantApps*/);














        List<ResolveInfo> query = queryIntentServicesInternal(







        List<ResolveInfo> query = queryIntentServicesInternal(











                intent, resolvedType, flags, userId, callingUid, false /*includeInstantApps*/);







                intent, resolvedType, flags, userId, callingUid, false /*includeInstantApps*/);











        if (query != null) {







        if (query != null) {










@@ -7581,7 +7574,7 @@ public class PackageManagerService extends IPackageManager.Stub









                false /*requireFullPermission*/, false /*checkShell*/,







                false /*requireFullPermission*/, false /*checkShell*/,











                "query intent receivers");







                "query intent receivers");











        final String instantAppPkgName = getInstantAppPackageName(callingUid);







        final String instantAppPkgName = getInstantAppPackageName(callingUid);











        flags = updateFlagsForResolve(flags, userId, intent, callingUid, includeInstantApps);







        flags = updateFlagsForResolve(flags, userId, callingUid, includeInstantApps);











        ComponentName comp = intent.getComponent();







        ComponentName comp = intent.getComponent();











        if (comp == null) {







        if (comp == null) {











            if (intent.getSelector() != null) {







            if (intent.getSelector() != null) {










@@ -7708,8 +7701,7 @@ public class PackageManagerService extends IPackageManager.Stub









        if (!mUserManager.exists(userId)) return Collections.emptyList();







        if (!mUserManager.exists(userId)) return Collections.emptyList();











        final int callingUid = Binder.getCallingUid();







        final int callingUid = Binder.getCallingUid();











        final String instantAppPkgName = getInstantAppPackageName(callingUid);







        final String instantAppPkgName = getInstantAppPackageName(callingUid);











        flags = updateFlagsForResolve(flags, userId, intent, callingUid,







        flags = updateFlagsForResolve(flags, userId, callingUid, false /*includeInstantApps*/);











                false /*includeInstantApps*/);














        ComponentName comp = intent.getComponent();







        ComponentName comp = intent.getComponent();











        if (comp == null) {







        if (comp == null) {











            if (intent.getSelector() != null) {







            if (intent.getSelector() != null) {










@@ -7831,7 +7823,7 @@ public class PackageManagerService extends IPackageManager.Stub









            return ParceledListSlice.emptyList();







            return ParceledListSlice.emptyList();











        }







        }











        if (!mUserManager.exists(userId)) return ParceledListSlice.emptyList();







        if (!mUserManager.exists(userId)) return ParceledListSlice.emptyList();











        flags = updateFlagsForPackage(flags, userId, null);







        flags = updateFlagsForPackage(flags, userId);











        final boolean listUninstalled = (flags & MATCH_KNOWN_PACKAGES) != 0;







        final boolean listUninstalled = (flags & MATCH_KNOWN_PACKAGES) != 0;











        final boolean listApex = (flags & MATCH_APEX) != 0;







        final boolean listApex = (flags & MATCH_APEX) != 0;











        final boolean listFactory = (flags & MATCH_FACTORY_ONLY) != 0;







        final boolean listFactory = (flags & MATCH_FACTORY_ONLY) != 0;










@@ -7931,7 +7923,7 @@ public class PackageManagerService extends IPackageManager.Stub









    public ParceledListSlice<PackageInfo> getPackagesHoldingPermissions(







    public ParceledListSlice<PackageInfo> getPackagesHoldingPermissions(











            String[] permissions, int flags, int userId) {







            String[] permissions, int flags, int userId) {











        if (!mUserManager.exists(userId)) return ParceledListSlice.emptyList();







        if (!mUserManager.exists(userId)) return ParceledListSlice.emptyList();











        flags = updateFlagsForPackage(flags, userId, permissions);







        flags = updateFlagsForPackage(flags, userId);











        mPermissionManager.enforceCrossUserPermission(Binder.getCallingUid(), userId,







        mPermissionManager.enforceCrossUserPermission(Binder.getCallingUid(), userId,











                true /* requireFullPermission */, false /* checkShell */,







                true /* requireFullPermission */, false /* checkShell */,











                "get packages holding permissions");







                "get packages holding permissions");










@@ -7973,7 +7965,7 @@ public class PackageManagerService extends IPackageManager.Stub









            return Collections.emptyList();







            return Collections.emptyList();











        }







        }











        if (!mUserManager.exists(userId)) return Collections.emptyList();







        if (!mUserManager.exists(userId)) return Collections.emptyList();











        flags = updateFlagsForApplication(flags, userId, null);







        flags = updateFlagsForApplication(flags, userId);











        final boolean listUninstalled = (flags & MATCH_KNOWN_PACKAGES) != 0;







        final boolean listUninstalled = (flags & MATCH_KNOWN_PACKAGES) != 0;



























        mPermissionManager.enforceCrossUserPermission(







        mPermissionManager.enforceCrossUserPermission(










@@ -8208,7 +8200,7 @@ public class PackageManagerService extends IPackageManager.Stub

























    private ProviderInfo resolveContentProviderInternal(String name, int flags, int userId) {







    private ProviderInfo resolveContentProviderInternal(String name, int flags, int userId) {











        if (!mUserManager.exists(userId)) return null;







        if (!mUserManager.exists(userId)) return null;











        flags = updateFlagsForComponent(flags, userId, name);







        flags = updateFlagsForComponent(flags, userId);











        final int callingUid = Binder.getCallingUid();







        final int callingUid = Binder.getCallingUid();











        final ProviderInfo providerInfo = mComponentResolver.queryProvider(name, flags, userId);







        final ProviderInfo providerInfo = mComponentResolver.queryProvider(name, flags, userId);











        if (providerInfo == null) {







        if (providerInfo == null) {










@@ -8247,7 +8239,7 @@ public class PackageManagerService extends IPackageManager.Stub









        final int userId = processName != null ? UserHandle.getUserId(uid)







        final int userId = processName != null ? UserHandle.getUserId(uid)











                : UserHandle.getCallingUserId();







                : UserHandle.getCallingUserId();











        if (!mUserManager.exists(userId)) return ParceledListSlice.emptyList();







        if (!mUserManager.exists(userId)) return ParceledListSlice.emptyList();











        flags = updateFlagsForComponent(flags, userId, processName);







        flags = updateFlagsForComponent(flags, userId);











        ArrayList<ProviderInfo> finalList = null;







        ArrayList<ProviderInfo> finalList = null;











        final List<ProviderInfo> matchList =







        final List<ProviderInfo> matchList =











                mComponentResolver.queryProviders(processName, metaDataKey, uid, flags, userId);







                mComponentResolver.queryProviders(processName, metaDataKey, uid, flags, userId);