Merge "Protect some more broadcasts." (63b0318e) · Commits · e / os / android_frameworks_base

core/res/AndroidManifest.xml

+16 −0

Original line number	Original line	Diff line number	Diff line
	@@ -369,6 +369,22 @@
	<protected-broadcast android:name="ScheduleConditionProvider.EVALUATE" />		<protected-broadcast android:name="ScheduleConditionProvider.EVALUATE" />
	<protected-broadcast android:name="wifi_scan_available" />		<protected-broadcast android:name="wifi_scan_available" />

			<protected-broadcast android:name="action.cne.started" />
			<protected-broadcast android:name="android.appwidget.action.APPWIDGET_UPDATE" />
			<protected-broadcast android:name="android.content.jobscheduler.JOB_DEADLINE_EXPIRED" />
			<protected-broadcast android:name="android.intent.action.ACTION_UNSOL_RESPONSE_OEM_HOOK_RAW" />
			<protected-broadcast android:name="android.location.HIGH_POWER_REQUEST_CHANGE" />
			<protected-broadcast android:name="android.location.HIGH_POWER_REQUEST_CHANGE" />
			<protected-broadcast android:name="android.net.conn.CONNECTIVITY_CHANGE_SUPL" />
			<protected-broadcast android:name="android.os.action.ACTION_EFFECTS_SUPPRESSOR_CHANGED" />
			<protected-broadcast android:name="android.os.action.LIGHT_DEVICE_IDLE_MODE_CHANGED" />
			<protected-broadcast android:name="android.os.storage.action.VOLUME_STATE_CHANGED" />
			<protected-broadcast android:name="com.android.server.action.UPDATE_TWILIGHT_STATE" />
			<protected-broadcast android:name="com.android.server.device_idle.STEP_IDLE_STATE" />
			<protected-broadcast android:name="com.android.server.device_idle.STEP_LIGHT_IDLE_STATE" />
			<protected-broadcast android:name="com.android.server.Wifi.action.TOGGLE_PNO" />
			<protected-broadcast android:name="intent.action.ACTION_RF_BAND_INFO" />

	<!-- ====================================================================== -->		<!-- ====================================================================== -->
	<!-- RUNTIME PERMISSIONS -->		<!-- RUNTIME PERMISSIONS -->
	<!-- ====================================================================== -->		<!-- ====================================================================== -->

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

+6 −4

Original line number	Original line	Diff line number	Diff line
	@@ -4086,12 +4086,14 @@ public class PackageManagerService extends IPackageManager.Stub {
	synchronized (mPackages) {		synchronized (mPackages) {
	if (mProtectedBroadcasts.contains(actionName)) {		if (mProtectedBroadcasts.contains(actionName)) {
	return true;		return true;
	} else if (actionName != null		} else if (actionName != null) {
	&& actionName.startsWith("android.net.netmon.lingerExpired")) {		// TODO: remove these terrible hacks
	// TODO: remove this terrible hack		if (actionName.startsWith("android.net.netmon.lingerExpired")
			\|\| actionName.startsWith("com.android.server.sip.SipWakeupTimer")) {
	return true;		return true;
	}		}
	}		}
			}
	return false;		return false;
	}		}