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

Commit b1f0006c authored by Amith Yamasani's avatar Amith Yamasani Committed by Automerger Merge Worker
Browse files

Merge "Fix typos in broadcast strings for RestrictionsManager" into tm-dev am: 44236ccc 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17312212

Change-Id: I93d4ae882cc1f009b1ab7152d47a67c8f0ed24d9
parents 133f6422 44236ccc

core/res/AndroidManifest.xml

+2 −4
Original line number Diff line number Diff line
@@ -471,11 +471,9 @@ 
        android:name="com.android.server.connectivityservice.CONNECTED_TO_PROVISIONING_NETWORK_ACTION" />



    <!-- Defined in RestrictionsManager -->

    <protected-broadcast

        android:name="android.intent.action.PERMISSION_RESPONSE_RECEIVED" />

    <!-- Defined in RestrictionsManager -->

    <protected-broadcast android:name="android.content.action.PERMISSION_RESPONSE_RECEIVED" />

    <protected-broadcast android:name="android.content.action.REQUEST_PERMISSION" />



    <protected-broadcast android:name="android.intent.action.REQUEST_PERMISSION" />

    <protected-broadcast android:name="android.nfc.handover.intent.action.HANDOVER_STARTED" />

    <protected-broadcast android:name="android.nfc.handover.intent.action.TRANSFER_DONE" />

    <protected-broadcast android:name="android.nfc.handover.intent.action.TRANSFER_PROGRESS" />