Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16a6725b authored Apr 22, 2015 by Svet Ganov Committed by Android (Google) Code Review Apr 22, 2015

Merge "Fix permission check imposed by broadcast sender."

parents 6eb72271 4f2dcfd4

services/core/java/com/android/server/am/BroadcastQueue.java

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -765,7 +765,8 @@ public final class BroadcastQueue {
	try {		try {
	perm = AppGlobals.getPackageManager().		perm = AppGlobals.getPackageManager().
	checkPermission(r.requiredPermission,		checkPermission(r.requiredPermission,
	info.activityInfo.applicationInfo.packageName, r.userId);		info.activityInfo.applicationInfo.packageName,
			UserHandle.getUserId(info.activityInfo.applicationInfo.uid));
	} catch (RemoteException e) {		} catch (RemoteException e) {
	perm = PackageManager.PERMISSION_DENIED;		perm = PackageManager.PERMISSION_DENIED;
	}		}

services/core/java/com/android/server/pm/PermissionsState.java

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -93,6 +93,9 @@ public final class PermissionsState {
	* @param other The other instance.		* @param other The other instance.
	*/		*/
	public void copyFrom(PermissionsState other) {		public void copyFrom(PermissionsState other) {
			if (other == this) {
			return;
			}
	if (mPermissions != null) {		if (mPermissions != null) {
	if (other.mPermissions == null) {		if (other.mPermissions == null) {
	mPermissions = null;		mPermissions = null;