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

Fix bug in CrossProfileApps#canInteractAcrossProfiles

Browse Source 
Changed canInteractAcrossProfiles to check that all other profiles have the appop enabled to return true,
previously it only checked the appop for the calling uid, which should
theoretically be always in sync with the other profiles, but we got a
bug were it wasn't in sync for an unidentified reason.

Test: atest com.android.cts.devicepolicy.CrossProfileAppsPermissionHostSideTest
Bug: 182396357
Bug: 183188804
Change-Id: Ied170ee87358ffa248bf4315d93a736f7307a3b2
This commit is contained in:
kholoud mohamed
2021-05-05 17:17:10 +01:00
committed by Kholoud Mohamed
parent 9aeedf48fb
commit cc3c2d99a4
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()