Merge "App ops: turn off content provider ops when running under test." into jb-mr2-dev (d0d209ed) · Commits · e / os / android_frameworks_base

core/java/android/content/ContentProvider.java

+17 −4

Original line number	Diff line number	Diff line
		@@ -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,11 +524,13 @@ public abstract class ContentProvider implements ComponentCallbacks2 {

		/** @hide */
		public final void setAppOps(int readOp, int writeOp) {
		if (!mNoPerms) {
		mTransport.mAppOpsManager = (AppOpsManager)mContext.getSystemService(
		Context.APP_OPS_SERVICE);
		mTransport.mReadOp = readOp;
		mTransport.mWriteOp = writeOp;
		}
		}

		/** @hide */
		public AppOpsManager getAppOpsManager() {
		@@ -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();
		}