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

Commit b00e5cc6 authored by Santos Cordon's avatar Santos Cordon Committed by Android (Google) Code Review
Browse files

Merge "Add permissions for the InCallUI Split." into klp-dev

parents d1544e3f 79836389

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ package android { 
    field public static final java.lang.String BATTERY_STATS = "android.permission.BATTERY_STATS";

    field public static final java.lang.String BIND_ACCESSIBILITY_SERVICE = "android.permission.BIND_ACCESSIBILITY_SERVICE";

    field public static final java.lang.String BIND_APPWIDGET = "android.permission.BIND_APPWIDGET";

    field public static final java.lang.String BIND_CALL_SERVICE = "android.permission.BIND_CALL_SERVICE";

    field public static final java.lang.String BIND_DEVICE_ADMIN = "android.permission.BIND_DEVICE_ADMIN";

    field public static final java.lang.String BIND_INPUT_METHOD = "android.permission.BIND_INPUT_METHOD";

    field public static final java.lang.String BIND_NFC_SERVICE = "android.permission.BIND_NFC_SERVICE";

core/res/AndroidManifest.xml

+7 −0
Original line number Diff line number Diff line
@@ -1103,6 +1103,13 @@ 
        android:description="@string/permdesc_use_sip"

        android:label="@string/permlab_use_sip" />



    <!-- Allows an application to request CallHandlerService implementations. -->

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

        android:permissionGroup="android.permission-group.PHONE_CALLS"

        android:protectionLevel="system|signature"

        android:description="@string/permdesc_bind_call_service"

        android:label="@string/permlab_bind_call_service" />



    <!-- ================================== -->

    <!-- Permissions for sdcard interaction -->

    <!-- ================================== -->

core/res/res/values/strings.xml

+5 −0
Original line number Diff line number Diff line
@@ -1897,6 +1897,11 @@ 
    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permdesc_use_sip">Allows the app to use the SIP service to make/receive Internet 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_bind_call_service">interact with in-call screen</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_bind_call_service">Allows the app to control when and how the user sees the in-call screen.</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_readNetworkUsageHistory">read historical network usage</string>

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