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

Not fetching MediaProvider from Clone Profile

Browse Source 
Ideally clone profile should not have MediaProvider instance, even if
have the MediaProvider avoid fetching it and redirect to owner profile's
MediaProvider. This change is in reaction to bug where MediaProvider is
being installed in clone profile, adding this safe check so that even if
MediaProvider is installed in clone profile it is never used and
redirected to owner's MediaProvider. This check would be present to
ensure fallback from errors.

Test: atest CtsAppCloningHostTest:com.android.cts.appcloning.AppCloningHostTest#testCrossUserMediaAccess
Bug: 236121588
Bug: 254302429
Change-Id: I9d5bcb3dcbcbf1559b45841296566c900738bf1a
Merged-In: I9d5bcb3dcbcbf1559b45841296566c900738bf1a
(cherry picked from commit 62be696b22)
This commit is contained in:
Sarup Dalwani
2022-10-21 13:52:29 +00:00
parent abee62b65c
commit 40f3827d3f
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
services/core/java/com/android/server/am/ContentProviderHelper.java
View File

@@ -80,6 +80,7 @@ import com.android.internal.util.FrameworkStatsLog;
import com.android.server.LocalServices;
import com.android.server.RescueParty;
import com.android.server.pm.UserManagerInternal;
import com.android.server.pm.UserManagerService;
import com.android.server.pm.parsing.pkg.AndroidPackage;
import java.io.FileDescriptor;
@@ -162,7 +163,7 @@ public class ContentProviderHelper {
private ContentProviderHolder getContentProviderImpl(IApplicationThread caller,
String name, IBinder token, int callingUid, String callingPackage, String callingTag,
boolean stable, int userId) {
ContentProviderRecord cpr;
ContentProviderRecord cpr = null;
ContentProviderConnection conn = null;
ProviderInfo cpi = null;
boolean providerRunning = false;
@@ -184,8 +185,21 @@ public class ContentProviderHelper {
checkTime(startTime, "getContentProviderImpl: getProviderByName");
// First check if this content provider has been published...
cpr = mProviderMap.getProviderByName(name, userId);
UserManagerService userManagerService = UserManagerService.getInstance();
/*
For clone user profile and allowed authority, skipping finding provider and redirecting
it to owner profile. Ideally clone profile should not have MediaProvider instance
installed and mProviderMap would not have entry for clone user. This is just fallback
check to ensure even if MediaProvider is installed in Clone Profile, it should not be
used and redirect to owner user's MediaProvider.
*/
//todo(b/236121588) MediaProvider should not be installed in clone profile.
if (!isAuthorityRedirectedForCloneProfile(name)
|| !userManagerService.isMediaSharedWithParent(userId)) {
// First check if this content provider has been published...
cpr = mProviderMap.getProviderByName(name, userId);
}
// If that didn't work, check if it exists for user 0 and then
// verify that it's a singleton provider before using it.
if (cpr == null && userId != UserHandle.USER_SYSTEM) {
@@ -200,11 +214,9 @@ public class ContentProviderHelper {
userId = UserHandle.USER_SYSTEM;
checkCrossUser = false;
} else if (isAuthorityRedirectedForCloneProfile(name)) {
UserManagerInternal umInternal = LocalServices.getService(
UserManagerInternal.class);
UserInfo userInfo = umInternal.getUserInfo(userId);
if (userInfo != null && userInfo.isCloneProfile()) {
if (userManagerService.isMediaSharedWithParent(userId)) {
UserManagerInternal umInternal = LocalServices.getService(
UserManagerInternal.class);
userId = umInternal.getProfileParentId(userId);
checkCrossUser = false;
}