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

Merge "Avoid crossing the user streams"

Browse Source
This commit is contained in:
Ivan Chiang
2019-08-20 02:40:51 +00:00
committed by Android (Google) Code Review
parent aa27745e42 ad127ef47c
commit 72d08095da
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/content/ContentService.java
View File

@@ -461,7 +461,7 @@ public final class ContentService extends IContentService.Stub {
}
synchronized (mCache) {
final String providerPackageName = getProviderPackageName(uri);
final String providerPackageName = getProviderPackageName(uri, userHandle);
invalidateCacheLocked(userHandle, providerPackageName, uri);
}
} finally {
@@ -1145,9 +1145,9 @@ public final class ContentService extends IContentService.Stub {
}
}
private @Nullable String getProviderPackageName(Uri uri) {
final ProviderInfo pi = mContext.getPackageManager()
.resolveContentProvider(uri.getAuthority(), 0);
private @Nullable String getProviderPackageName(Uri uri, int userId) {
final ProviderInfo pi = mContext.getPackageManager().resolveContentProviderAsUser(
uri.getAuthority(), 0, userId);
return (pi != null) ? pi.packageName : null;
}
@@ -1200,7 +1200,7 @@ public final class ContentService extends IContentService.Stub {
mContext.getSystemService(AppOpsManager.class).checkPackage(Binder.getCallingUid(),
packageName);
final String providerPackageName = getProviderPackageName(key);
final String providerPackageName = getProviderPackageName(key, userId);
final Pair<String, Uri> fullKey = Pair.create(packageName, key);
synchronized (mCache) {
@@ -1222,7 +1222,7 @@ public final class ContentService extends IContentService.Stub {
mContext.getSystemService(AppOpsManager.class).checkPackage(Binder.getCallingUid(),
packageName);
final String providerPackageName = getProviderPackageName(key);
final String providerPackageName = getProviderPackageName(key, userId);
final Pair<String, Uri> fullKey = Pair.create(packageName, key);
synchronized (mCache) {