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

am 3cb15637: Allow singleton providers to accept connections from other users

Browse Source 
* commit '3cb156372b0b18030196e17f1d503e2a62531594':
  Allow singleton providers to accept connections from other users
This commit is contained in:
Amith Yamasani
2014-08-08 23:56:48 +00:00
committed by Android Git Automerger
parent 8a881cc33a a6f4d58b90
commit e6e2d08938
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/content/ContentProvider.java
View File

@@ -107,6 +107,7 @@ public abstract class ContentProvider implements ComponentCallbacks2 {
private PathPermission[] mPathPermissions;
private boolean mExported;
private boolean mNoPerms;
private boolean mSingleUser;
private final ThreadLocal<String> mCallingPackage = new ThreadLocal<String>();
@@ -460,6 +461,7 @@ public abstract class ContentProvider implements ComponentCallbacks2 {
boolean checkUser(int pid, int uid, Context context) {
return UserHandle.getUserId(uid) == context.getUserId()
|| mSingleUser
|| context.checkPermission(INTERACT_ACROSS_USERS, pid, uid)
== PERMISSION_GRANTED;
}
@@ -1674,6 +1676,7 @@ public abstract class ContentProvider implements ComponentCallbacks2 {
setWritePermission(info.writePermission);
setPathPermissions(info.pathPermissions);
mExported = info.exported;
mSingleUser = (info.flags & ProviderInfo.FLAG_SINGLE_USER) != 0;
setAuthorities(info.authority);
}
ContentProvider.this.onCreate();