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

Merge "App ops: turn off content provider ops when running under test." into jb-mr2-dev

Browse Source
This commit is contained in:
Dianne Hackborn
2013-02-26 21:39:42 +00:00
committed by Android (Google) Code Review
parent 47a5f40465 7e6f976c87
commit d0d209ed4d
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -101,6 +101,7 @@ public abstract class ContentProvider implements ComponentCallbacks2 {
private String mWritePermission;
private PathPermission[] mPathPermissions;
private boolean mExported;
private boolean mNoPerms;
private Transport mTransport = new Transport();
@@ -523,10 +524,12 @@ public abstract class ContentProvider implements ComponentCallbacks2 {
/** @hide */
public final void setAppOps(int readOp, int writeOp) {
mTransport.mAppOpsManager = (AppOpsManager)mContext.getSystemService(
Context.APP_OPS_SERVICE);
mTransport.mReadOp = readOp;
mTransport.mWriteOp = writeOp;
if (!mNoPerms) {
mTransport.mAppOpsManager = (AppOpsManager)mContext.getSystemService(
Context.APP_OPS_SERVICE);
mTransport.mReadOp = readOp;
mTransport.mWriteOp = writeOp;
}
}
/** @hide */
@@ -1191,6 +1194,16 @@ public abstract class ContentProvider implements ComponentCallbacks2 {
setWritePermission(info.writePermission);
setPathPermissions(info.pathPermissions);
mExported = info.exported;
mNoPerms = false;
} else {
// We enter here because the content provider is being instantiated
// as a mock. We don't have any information about the provider (such
// as its required permissions), and also want to avoid doing app op
// checks since these aren't real calls coming in and we may not be
// able to get the app ops service at all (if the test is using something
// like the IsolatedProvider). So set this to true, to prevent us
// from enabling app ops on this object.
mNoPerms = true;
}
ContentProvider.this.onCreate();
}