resolved conflicts for merge of 03422d26 to master (8d717b91) · Commits · e / os / android_frameworks_base

core/java/android/app/AppOpsManager.java

+10 −6

Original line number	Diff line number	Diff line
		@@ -575,6 +575,10 @@ public class AppOpsManager {
		}
		}

		private String buildSecurityExceptionMsg(int op, int uid, String packageName) {
		return packageName + " from uid " + uid + " not allowed to perform " + sOpNames[op];
		}

		/**
		* Do a quick check for whether an application might be able to perform an operation.
		* This is <em>not</em> a security check; you must use {@link #noteOp(int, int, String)}
		@@ -595,7 +599,7 @@ public class AppOpsManager {
		try {
		int mode = mService.checkOperation(op, uid, packageName);
		if (mode == MODE_ERRORED) {
		throw new SecurityException("Operation not allowed");
		throw new SecurityException(buildSecurityExceptionMsg(op, uid, packageName));
		}
		return mode;
		} catch (RemoteException e) {
		@@ -650,7 +654,7 @@ public class AppOpsManager {
		try {
		int mode = mService.noteOperation(op, uid, packageName);
		if (mode == MODE_ERRORED) {
		throw new SecurityException("Operation not allowed");
		throw new SecurityException(buildSecurityExceptionMsg(op, uid, packageName));
		}
		return mode;
		} catch (RemoteException e) {
		@@ -672,7 +676,7 @@ public class AppOpsManager {

		/** @hide */
		public int noteOp(int op) {
		return noteOp(op, Process.myUid(), mContext.getBasePackageName());
		return noteOp(op, Process.myUid(), mContext.getOpPackageName());
		}

		/** @hide */
		@@ -710,7 +714,7 @@ public class AppOpsManager {
		try {
		int mode = mService.startOperation(getToken(mService), op, uid, packageName);
		if (mode == MODE_ERRORED) {
		throw new SecurityException("Operation not allowed");
		throw new SecurityException(buildSecurityExceptionMsg(op, uid, packageName));
		}
		return mode;
		} catch (RemoteException e) {
		@@ -732,7 +736,7 @@ public class AppOpsManager {

		/** @hide */
		public int startOp(int op) {
		return startOp(op, Process.myUid(), mContext.getBasePackageName());
		return startOp(op, Process.myUid(), mContext.getOpPackageName());
		}

		/**
		@@ -749,6 +753,6 @@ public class AppOpsManager {
		}

		public void finishOp(int op) {
		finishOp(op, Process.myUid(), mContext.getBasePackageName());
		finishOp(op, Process.myUid(), mContext.getOpPackageName());
		}
		}

core/java/android/app/ApplicationPackageManager.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1275,7 +1275,7 @@ final class ApplicationPackageManager extends PackageManager {
		int newState, int flags) {
		try {
		mPM.setApplicationEnabledSetting(packageName, newState, flags,
		mContext.getUserId(), mContext.getBasePackageName());
		mContext.getUserId(), mContext.getOpPackageName());
		} catch (RemoteException e) {
		// Should never happen!
		}

core/java/android/app/ContextImpl.java

+24 −1

Original line number	Diff line number	Diff line
		@@ -183,6 +183,7 @@ class ContextImpl extends Context {

		/package/ LoadedApk mPackageInfo;
		private String mBasePackageName;
		private String mOpPackageName;
		private Resources mResources;
		/package/ ActivityThread mMainThread;
		private Context mOuterContext;
		@@ -679,6 +680,12 @@ class ContextImpl extends Context {
		return mBasePackageName != null ? mBasePackageName : getPackageName();
		}

		/** @hide */
		@Override
		public String getOpPackageName() {
		return mOpPackageName != null ? mOpPackageName : getBasePackageName();
		}

		@Override
		public ApplicationInfo getApplicationInfo() {
		if (mPackageInfo != null) {
		@@ -1961,6 +1968,7 @@ class ContextImpl extends Context {
		public ContextImpl(ContextImpl context) {
		mPackageInfo = context.mPackageInfo;
		mBasePackageName = context.mBasePackageName;
		mOpPackageName = context.mOpPackageName;
		mResources = context.mResources;
		mMainThread = context.mMainThread;
		mContentResolver = context.mContentResolver;
		@@ -1977,7 +1985,21 @@ class ContextImpl extends Context {
		final void init(LoadedApk packageInfo, IBinder activityToken, ActivityThread mainThread,
		Resources container, String basePackageName, UserHandle user) {
		mPackageInfo = packageInfo;
		mBasePackageName = basePackageName != null ? basePackageName : packageInfo.mPackageName;
		if (basePackageName != null) {
		mBasePackageName = mOpPackageName = basePackageName;
		} else {
		mBasePackageName = packageInfo.mPackageName;
		ApplicationInfo ainfo = packageInfo.getApplicationInfo();
		if (ainfo.uid == Process.SYSTEM_UID && ainfo.uid != Process.myUid()) {
		// Special case: system components allow themselves to be loaded in to other
		// processes. For purposes of app ops, we must then consider the context as
		// belonging to the package of this process, not the system itself, otherwise
		// the package+uid verifications in app ops will fail.
		mOpPackageName = ActivityThread.currentPackageName();
		} else {
		mOpPackageName = mBasePackageName;
		}
		}
		mResources = mPackageInfo.getResources(mainThread);
		mResourcesManager = ResourcesManager.getInstance();

		@@ -2011,6 +2033,7 @@ class ContextImpl extends Context {
		final void init(Resources resources, ActivityThread mainThread, UserHandle user) {
		mPackageInfo = null;
		mBasePackageName = null;
		mOpPackageName = null;
		mResources = resources;
		mMainThread = mainThread;
		mContentResolver = new ApplicationContentResolver(this, mainThread, user);

core/java/android/app/NotificationManager.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -133,7 +133,7 @@ public class NotificationManager
		}
		if (localLOGV) Log.v(TAG, pkg + ": notify(" + id + ", " + notification + ")");
		try {
		service.enqueueNotificationWithTag(pkg, mContext.getBasePackageName(), tag, id,
		service.enqueueNotificationWithTag(pkg, mContext.getOpPackageName(), tag, id,
		notification, idOut, UserHandle.myUserId());
		if (id != idOut[0]) {
		Log.w(TAG, "notify: id corrupted: sent " + id + ", got back " + idOut[0]);
		@@ -158,7 +158,7 @@ public class NotificationManager
		}
		if (localLOGV) Log.v(TAG, pkg + ": notify(" + id + ", " + notification + ")");
		try {
		service.enqueueNotificationWithTag(pkg, mContext.getBasePackageName(), tag, id,
		service.enqueueNotificationWithTag(pkg, mContext.getOpPackageName(), tag, id,
		notification, idOut, user.getIdentifier());
		if (id != idOut[0]) {
		Log.w(TAG, "notify: id corrupted: sent " + id + ", got back " + idOut[0]);

core/java/android/content/ClipboardManager.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -122,7 +122,7 @@ public class ClipboardManager extends android.text.ClipboardManager {
		if (clip != null) {
		clip.prepareToLeaveProcess();
		}
		getService().setPrimaryClip(clip, mContext.getBasePackageName());
		getService().setPrimaryClip(clip, mContext.getOpPackageName());
		} catch (RemoteException e) {
		}
		}
		@@ -132,7 +132,7 @@ public class ClipboardManager extends android.text.ClipboardManager {
		*/
		public ClipData getPrimaryClip() {
		try {
		return getService().getPrimaryClip(mContext.getBasePackageName());
		return getService().getPrimaryClip(mContext.getOpPackageName());
		} catch (RemoteException e) {
		return null;
		}
		@@ -144,7 +144,7 @@ public class ClipboardManager extends android.text.ClipboardManager {
		*/
		public ClipDescription getPrimaryClipDescription() {
		try {
		return getService().getPrimaryClipDescription(mContext.getBasePackageName());
		return getService().getPrimaryClipDescription(mContext.getOpPackageName());
		} catch (RemoteException e) {
		return null;
		}
		@@ -155,7 +155,7 @@ public class ClipboardManager extends android.text.ClipboardManager {
		*/
		public boolean hasPrimaryClip() {
		try {
		return getService().hasPrimaryClip(mContext.getBasePackageName());
		return getService().hasPrimaryClip(mContext.getOpPackageName());
		} catch (RemoteException e) {
		return false;
		}
		@@ -166,7 +166,7 @@ public class ClipboardManager extends android.text.ClipboardManager {
		if (mPrimaryClipChangedListeners.size() == 0) {
		try {
		getService().addPrimaryClipChangedListener(
		mPrimaryClipChangedServiceListener, mContext.getBasePackageName());
		mPrimaryClipChangedServiceListener, mContext.getOpPackageName());
		} catch (RemoteException e) {
		}
		}
		@@ -213,7 +213,7 @@ public class ClipboardManager extends android.text.ClipboardManager {
		*/
		public boolean hasText() {
		try {
		return getService().hasClipboardText(mContext.getBasePackageName());
		return getService().hasClipboardText(mContext.getOpPackageName());
		} catch (RemoteException e) {
		return false;
		}