commit 39a0e83f84486eb2a6c766a1a272059d353368da
author Cassie <xih@google.com> Tue Mar 27 23:03:47 2018 +0000
committer android-build-merger <android-build-merger@google.com> Tue Mar 27 23:03:47 2018 +0000
tree 398e47ec41d7b7036249e54764312868f9f39669
parent 91bc5fdd26b8ed97e994eddc6971f7324c5acdef
parent 6af2727b7bbaaef0deb4cd88b96acc01183fe80e

Merge "Change the Auto-select Network UI."
am: 6af2727b7b

Change-Id: Ia136caabdb9954f4ba994c2f01b37a05e7af2198

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c9281d1..529082b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -79,10 +79,10 @@
     <protected-broadcast android:name= "com.android.phone.vvm.ACTION_VISUAL_VOICEMAIL_SERVICE_EVENT" />
     <protected-broadcast android:name= "com.android.internal.telephony.CARRIER_VVM_PACKAGE_INSTALLED" />
     <protected-broadcast android:name= "com.android.cellbroadcastreceiver.GET_LATEST_CB_AREA_INFO" />
+    <protected-broadcast android:name= "android.intent.action.CURRENT_CARRIER_IDENTITY_CHANGED" />
     <protected-broadcast android:name= "android.telephony.action.SIM_CARD_STATE_CHANGED" />
     <protected-broadcast android:name= "android.telephony.action.SIM_APPLICATION_STATE_CHANGED" />
     <protected-broadcast android:name= "android.telephony.action.SIM_SLOT_STATUS_CHANGED" />
-    <protected-broadcast android:name= "android.telephony.action.SUBSCRIPTION_CARRIER_IDENTITY_CHANGED" />
 
     <uses-permission android:name="android.permission.BROADCAST_STICKY" />
     <uses-permission android:name="android.permission.CALL_PHONE" />