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

Commit f6c6919e authored by Kholoud Mohamed's avatar Kholoud Mohamed Committed by Automerger Merge Worker
Browse files

Merge "Fix bug in CrossProfileApps#canInteractAcrossProfiles" into sc-dev am: e314b294 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14443439

Change-Id: Ia21f7036931e3485fa57d47045e020de52e67849
parents 9654d74e e314b294

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

+25 −1
Original line number Diff line number Diff line
@@ -288,7 +288,9 @@ public class CrossProfileAppsServiceImpl extends ICrossProfileApps.Stub { 
        if (targetUserProfiles.isEmpty()) {

            return false;

        }

        return hasCallerGotInteractAcrossProfilesPermission(callingPackage);

        return hasCallerGotInteractAcrossProfilesPermission(callingPackage)

                && haveProfilesGotInteractAcrossProfilesPermission(

                        callingPackage, targetUserProfiles);

    }



    private boolean hasCallerGotInteractAcrossProfilesPermission(String callingPackage) {
@@ -296,6 +298,28 @@ public class CrossProfileAppsServiceImpl extends ICrossProfileApps.Stub { 
                callingPackage, mInjector.getCallingUid(), mInjector.getCallingPid());

    }



    private boolean haveProfilesGotInteractAcrossProfilesPermission(

            String packageName, List<UserHandle> profiles) {

        for (UserHandle profile : profiles) {

            final int uid = mInjector.withCleanCallingIdentity(() -> {

                try {

                    return mInjector.getPackageManager().getPackageUidAsUser(

                            packageName, /* flags= */ 0, profile.getIdentifier());

                } catch (PackageManager.NameNotFoundException e) {

                    return -1;

                }

            });

            if (uid == -1) {

                return false;

            }

            if (!hasInteractAcrossProfilesPermission(

                    packageName, uid, PermissionChecker.PID_UNKNOWN)) {

                return false;

            }

        }

        return true;

    }



    private boolean isCrossProfilePackageAllowlisted(String packageName) {

        return mInjector.withCleanCallingIdentity(() ->

                mInjector.getDevicePolicyManagerInternal()