Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Protect more broadcasts." into nyc-dev

Browse Source 
am: 32fa8d1

* commit '32fa8d13714928e9231762276c5851bd2d51d7b0':
  Protect more broadcasts.

Change-Id: I1b247630ecd11c807e843ed715af885e065f5124
This commit is contained in:
Jeff Sharkey
2016-04-06 15:05:14 +00:00
committed by android-build-merger
parent 47a351c932 32fa8d1371
commit 32584cbbba
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/res/AndroidManifest.xml
View File

@@ -401,7 +401,6 @@
<protected-broadcast android:name="android.telephony.action.CARRIER_CONFIG_CHANGED" />
<protected-broadcast android:name="com.android.bluetooth.btservice.action.ALARM_WAKEUP" />
<protected-broadcast android:name="com.android.ims.IMS_SERVICE_UP" />
<protected-broadcast android:name="com.android.server.action.NETWORK_STATS_POLL" />
<protected-broadcast android:name="com.android.server.action.NETWORK_STATS_UPDATED" />
<protected-broadcast android:name="com.android.server.NetworkTimeUpdateService.action.POLL" />
@@ -461,8 +460,15 @@
<protected-broadcast android:name="android.net.wifi.PASSPOINT_ICON_RECEIVED" />
<protected-broadcast android:name="com.android.server.notification.CountdownConditionProvider" />
<!-- @hide UCE service Notification -->
<protected-broadcast android:name="com.android.ims.IMS_SERVICE_UP" />
<protected-broadcast android:name="com.android.ims.IMS_INCOMING_CALL" />
<protected-broadcast android:name="com.android.ims.internal.uce.UCE_SERVICE_UP" />
<protected-broadcast android:name="com.android.intent.action.IMS_FEATURE_CHANGED" />
<protected-broadcast android:name="com.android.intent.action.IMS_CONFIG_CHANGED" />
<protected-broadcast android:name="com.android.internal.location.ALARM_WAKEUP" />
<protected-broadcast android:name="com.android.internal.location.ALARM_TIMEOUT" />
<protected-broadcast android:name="android.intent.action.GLOBAL_BUTTON" />
<!-- ====================================================================== -->
<!-- RUNTIME PERMISSIONS -->