Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Kholoud Mohamed
2021-05-18 08:22:02 +00:00
committed by Android (Google) Code Review
parent 51f0592fe6 cc3c2d99a4
commit e314b29428
1 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
services/core/java/com/android/server/pm/CrossProfileAppsServiceImpl.java
View File

@@ -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()