Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 47d41c19 authored by yinxu's avatar yinxu Committed by android-build-merger
Browse files

Merge "Fix the inconsistency of action EUICC_FACTORY_RESET" into oc-dr1-dev am: 669f5603 

am: 6b48db97

Change-Id: Ib4b10cf44301d0246e0fa252c23529785ac33346
parents f99c0f4a 6b48db97

core/res/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ 
    <protected-broadcast android:name="com.android.server.WifiManager.action.DEVICE_IDLE" />

    <protected-broadcast android:name="com.android.server.action.REMOTE_BUGREPORT_SHARING_ACCEPTED" />

    <protected-broadcast android:name="com.android.server.action.REMOTE_BUGREPORT_SHARING_DECLINED" />

    <protected-broadcast android:name="com.android.server.action.WIPE_EUICC_DATA" />

    <protected-broadcast android:name="com.android.internal.action.EUICC_FACTORY_RESET" />

    <protected-broadcast android:name="com.android.server.usb.ACTION_OPEN_IN_APPS" />

    <protected-broadcast android:name="com.android.server.am.DELETE_DUMPHEAP" />

    <protected-broadcast android:name="com.android.server.net.action.SNOOZE_WARNING" />