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

Commit c33f2e50 authored by Shuo Qian's avatar Shuo Qian Committed by Automerger Merge Worker
Browse files

Merge "Add title and description of MANAGE_ONGOING_CALLS" am: 45066562 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id40ac228e5771419a88bc47977eb74819b313ca4
parents edeb75ca 45066562

core/res/AndroidManifest.xml

+3 −1
Original line number Diff line number Diff line
@@ -2206,7 +2206,9 @@ 
    <!-- Allows to query ongoing call details and manage ongoing calls

     <p>Protection level: signature|appop -->

    <permission android:name="android.permission.MANAGE_ONGOING_CALLS"

        android:protectionLevel="signature|appop" />

        android:protectionLevel="signature|appop"

        android:label="@string/permlab_manageOngoingCalls"

        android:description="@string/permdesc_manageOngoingCalls" />



    <!-- Allows the app to request network scans from telephony.

         <p>Not for use by third-party applications.

core/res/res/values/strings.xml

+9 −0
Original line number Diff line number Diff line
@@ -914,6 +914,15 @@ 
        interfere with the performance or operation of your device when an

        emergency cell broadcast is received.</string>



    <!-- Title for an application which grants an app the ability to see and manage calls on

         the user's device. Usually reserved for apps associated with wearable devices that

         can show information about calls. -->

    <string name="permlab_manageOngoingCalls">Manage ongoing calls</string>

    <!-- Description of an application permission, listed so the user can choose whether they

         want to allow the application to do this. -->

    <string name="permdesc_manageOngoingCalls">Allows an app to see details about ongoing calls

         on your device and to control these calls.</string>



    <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permlab_readCellBroadcasts">read cell broadcast messages</string>

    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->