diff options
| author | 2020-01-30 23:45:52 +0000 | |
|---|---|---|
| committer | 2020-01-30 23:45:52 +0000 | |
| commit | 3f6ebb55ffd21201a87dfd9ad403f51dff031b14 (patch) | |
| tree | 23d463be91fc984b0effb0ac981b0f1815e33b73 | |
| parent | 841520a13d06727399446a6bacd06c4ae157e79c (diff) | |
| parent | 8acac15ced053fe22eb735490c660762ac5c4fa8 (diff) | |
Merge "Whitelist telephony broadcasts for bground use"
| -rw-r--r-- | core/java/android/telephony/CellBroadcastIntents.java | 1 | ||||
| -rw-r--r-- | data/etc/framework-sysconfig.xml | 24 |
2 files changed, 21 insertions, 4 deletions
diff --git a/core/java/android/telephony/CellBroadcastIntents.java b/core/java/android/telephony/CellBroadcastIntents.java index 32d330e1a47f..921ad3c74681 100644 --- a/core/java/android/telephony/CellBroadcastIntents.java +++ b/core/java/android/telephony/CellBroadcastIntents.java @@ -81,7 +81,6 @@ public class CellBroadcastIntents { int initialCode, int slotIndex) { Intent backgroundIntent = new Intent(Telephony.Sms.Intents.SMS_CB_RECEIVED_ACTION); backgroundIntent.putExtra(EXTRA_MESSAGE, smsCbMessage); - backgroundIntent.setFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND); putPhoneIdAndSubIdExtra(context, backgroundIntent, slotIndex); String receiverPermission = Manifest.permission.RECEIVE_SMS; diff --git a/data/etc/framework-sysconfig.xml b/data/etc/framework-sysconfig.xml index 7296cfdfbec7..3d78eb9c59b7 100644 --- a/data/etc/framework-sysconfig.xml +++ b/data/etc/framework-sysconfig.xml @@ -19,11 +19,29 @@ <!-- Broadcast actions that are currently exempted from O+ background delivery restrictions. --> - <allow-implicit-broadcast action="android.intent.action.SIM_STATE_CHANGED" /> - <allow-implicit-broadcast action="android.intent.action.PACKAGE_CHANGED" /> + <allow-implicit-broadcast action="android.intent.action.ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED" /> + <allow-implicit-broadcast action="android.intent.action.ACTION_DEFAULT_VOICE_SUBSCRIPTION_CHANGED" /> + <allow-implicit-broadcast action="android.intent.action.DATA_SMS_RECEIVED" /> <allow-implicit-broadcast action="android.intent.action.MEDIA_SCANNER_SCAN_FILE" /> - <allow-implicit-broadcast action="android.media.action.OPEN_AUDIO_EFFECT_CONTROL_SESSION" /> + <allow-implicit-broadcast action="android.intent.action.PACKAGE_CHANGED" /> + <allow-implicit-broadcast action="android.intent.action.SIM_STATE_CHANGED" /> <allow-implicit-broadcast action="android.media.action.CLOSE_AUDIO_EFFECT_CONTROL_SESSION" /> + <allow-implicit-broadcast action="android.media.action.OPEN_AUDIO_EFFECT_CONTROL_SESSION" /> + <allow-implicit-broadcast action="android.provider.Telephony.SECRET_CODE" /> + <allow-implicit-broadcast action="android.provider.Telephony.SMS_CB_RECEIVED" /> + <allow-implicit-broadcast action="android.provider.Telephony.SMS_DELIVER" /> + <allow-implicit-broadcast action="android.provider.Telephony.SMS_RECEIVED" /> + <allow-implicit-broadcast action="android.provider.Telephony.SMS_REJECTED" /> + <allow-implicit-broadcast action="android.provider.Telephony.WAP_PUSH_DELIVER" /> + <allow-implicit-broadcast action="android.provider.Telephony.WAP_PUSH_RECEIVED" /> + <allow-implicit-broadcast action="android.telephony.action.CARRIER_CONFIG_CHANGED" /> + <allow-implicit-broadcast action="android.telephony.action.DEFAULT_SMS_SUBSCRIPTION_CHANGED" /> + <allow-implicit-broadcast action="android.telephony.action.DEFAULT_SUBSCRIPTION_CHANGED" /> + <allow-implicit-broadcast action="android.telephony.action.SECRET_CODE" /> + <allow-implicit-broadcast action="android.telephony.action.SIM_APPLICATION_STATE_CHANGED" /> + <allow-implicit-broadcast action="android.telephony.action.SIM_CARD_STATE_CHANGED" /> + <allow-implicit-broadcast action="android.telephony.action.SIM_SLOT_STATUS_CHANGED" /> + <!-- Whitelist of what components are permitted as backup data transports. The 'service' attribute here is a flattened ComponentName string. --> |