Merge "Fix another issue #7097984 java.lang.SecurityException: Permission Denial:" into jb-mr1-dev (bac6c129) · Commits · e / os / android_frameworks_base

services/java/com/android/server/AppWidgetService.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -155,8 +155,8 @@ class AppWidgetService extends IAppWidgetService.Stub

		// Register for configuration changes so we can update the names
		// of the widgets when the locale changes.
		mContext.registerReceiver(mBroadcastReceiver, new IntentFilter(
		Intent.ACTION_CONFIGURATION_CHANGED), null, null);
		mContext.registerReceiverAsUser(mBroadcastReceiver, UserHandle.ALL,
		new IntentFilter(Intent.ACTION_CONFIGURATION_CHANGED), null, null);

		// Register for broadcasts about package install, etc., so we can
		// update the provider list.

services/java/com/android/server/ConnectivityService.java

+25 −5

Original line number	Diff line number	Diff line
		@@ -1852,8 +1852,13 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		Intent intent = new Intent(ConnectivityManager.ACTION_DATA_ACTIVITY_CHANGE);
		intent.putExtra(ConnectivityManager.EXTRA_DEVICE_TYPE, deviceType);
		intent.putExtra(ConnectivityManager.EXTRA_IS_ACTIVE, active);
		final long ident = Binder.clearCallingIdentity();
		try {
		mContext.sendOrderedBroadcastAsUser(intent, UserHandle.ALL,
		RECEIVE_DATA_ACTIVITY_CHANGE, null, null, 0, null, null);
		} finally {
		Binder.restoreCallingIdentity(ident);
		}
		}

		/**
		@@ -1927,7 +1932,12 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		log("sendStickyBroadcast: action=" + intent.getAction());
		}

		final long ident = Binder.clearCallingIdentity();
		try {
		mContext.sendStickyBroadcastAsUser(intent, UserHandle.ALL);
		} finally {
		Binder.restoreCallingIdentity(ident);
		}
		}
		}

		@@ -2467,7 +2477,12 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		* Connectivity events can happen before boot has completed ...
		*/
		intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT);
		final long ident = Binder.clearCallingIdentity();
		try {
		mContext.sendBroadcastAsUser(intent, UserHandle.ALL);
		} finally {
		Binder.restoreCallingIdentity(ident);
		}
		}

		// Caller must grab mDnsLock.
		@@ -3112,7 +3127,12 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING \|
		Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT);
		intent.putExtra(Proxy.EXTRA_PROXY_INFO, proxy);
		final long ident = Binder.clearCallingIdentity();
		try {
		mContext.sendStickyBroadcastAsUser(intent, UserHandle.ALL);
		} finally {
		Binder.restoreCallingIdentity(ident);
		}
		}

		private static class SettingsObserver extends ContentObserver {