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

Merge "Not fetching MediaProvider from Clone Profile" into tm-qpr-dev

Browse Source
This commit is contained in:
Sarup Dalwani
2022-11-09 18:15:35 +00:00
committed by Android (Google) Code Review
parent 28b3fee28a 40f3827d3f
commit 00773c6a8e
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.LocalServices;
import com.android.server.RescueParty; import com.android.server.RescueParty;
import com.android.server.pm.UserManagerInternal; import com.android.server.pm.UserManagerInternal;
import com.android.server.pm.UserManagerService;
import com.android.server.pm.parsing.pkg.AndroidPackage; import com.android.server.pm.parsing.pkg.AndroidPackage;
import java.io.FileDescriptor; import java.io.FileDescriptor;
@@ -162,7 +163,7 @@ public class ContentProviderHelper {
private ContentProviderHolder getContentProviderImpl(IApplicationThread caller, private ContentProviderHolder getContentProviderImpl(IApplicationThread caller,
String name, IBinder token, int callingUid, String callingPackage, String callingTag, String name, IBinder token, int callingUid, String callingPackage, String callingTag,
boolean stable, int userId) { boolean stable, int userId) {
ContentProviderRecord cpr; ContentProviderRecord cpr = null;
ContentProviderConnection conn = null; ContentProviderConnection conn = null;
ProviderInfo cpi = null; ProviderInfo cpi = null;
boolean providerRunning = false; boolean providerRunning = false;
@@ -184,8 +185,21 @@ public class ContentProviderHelper {
checkTime(startTime, "getContentProviderImpl: getProviderByName"); checkTime(startTime, "getContentProviderImpl: getProviderByName");
// First check if this content provider has been published... UserManagerService userManagerService = UserManagerService.getInstance();
cpr = mProviderMap.getProviderByName(name, userId);
/*
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 // If that didn't work, check if it exists for user 0 and then
// verify that it's a singleton provider before using it. // verify that it's a singleton provider before using it.
if (cpr == null && userId != UserHandle.USER_SYSTEM) { if (cpr == null && userId != UserHandle.USER_SYSTEM) {
@@ -200,11 +214,9 @@ public class ContentProviderHelper {
userId = UserHandle.USER_SYSTEM; userId = UserHandle.USER_SYSTEM;
checkCrossUser = false; checkCrossUser = false;
} else if (isAuthorityRedirectedForCloneProfile(name)) { } else if (isAuthorityRedirectedForCloneProfile(name)) {
UserManagerInternal umInternal = LocalServices.getService( if (userManagerService.isMediaSharedWithParent(userId)) {
UserManagerInternal.class); UserManagerInternal umInternal = LocalServices.getService(
UserInfo userInfo = umInternal.getUserInfo(userId); UserManagerInternal.class);
if (userInfo != null && userInfo.isCloneProfile()) {
userId = umInternal.getProfileParentId(userId); userId = umInternal.getProfileParentId(userId);
checkCrossUser = false; checkCrossUser = false;
} }