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

Commit 18670ca8 authored by Neha Pattan's avatar Neha Pattan Committed by Android (Google) Code Review
Browse files

Merge "(1/2) Placeholder for permissions that need to be declared for SupplementalApis."

parents aec1bdf2 0af56b4b

core/api/current.txt

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

    field public static final String ACCESS_NETWORK_STATE = "android.permission.ACCESS_NETWORK_STATE";

    field public static final String ACCESS_NOTIFICATION_POLICY = "android.permission.ACCESS_NOTIFICATION_POLICY";

    field public static final String ACCESS_SUPPLEMENTAL_APIS = "android.permission.ACCESS_SUPPLEMENTAL_APIS";

    field public static final String ACCESS_WIFI_STATE = "android.permission.ACCESS_WIFI_STATE";

    field public static final String ACCOUNT_MANAGER = "android.permission.ACCOUNT_MANAGER";

    field public static final String ACTIVITY_RECOGNITION = "android.permission.ACTIVITY_RECOGNITION";

core/res/AndroidManifest.xml

+12 −0
Original line number Diff line number Diff line
@@ -3595,6 +3595,18 @@ 
    <permission android:name="android.permission.REQUEST_INCIDENT_REPORT_APPROVAL"

        android:protectionLevel="signature|privileged" />



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

    <!-- Permissions for SupplementalApi -->

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

    <eat-comment />



    <!-- TODO(b/213488783): Update with correct names. -->

    <!-- Allows an application to access SupplementalApis. -->

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

        android:label="@string/permlab_accessSupplementalApi"

        android:description="@string/permdesc_accessSupplementalApi"

        android:protectionLevel="normal" />



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

    <!-- Private permissions                  -->

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

core/res/res/values/strings.xml

+6 −1
Original line number Diff line number Diff line
@@ -4046,11 +4046,16 @@ 
    <!-- Description of an application permission that lets it ask user to ignore battery optimizations for that app-->

    <string name="permdesc_requestIgnoreBatteryOptimizations">Allows an app to ask for permission to ignore battery optimizations for that app.</string>



    <!-- Title of an application permission that lets query all other packages. [CHAR LIMIT=NONE] -->

    <!-- Title of an application permission that lets it query all other packages. [CHAR LIMIT=NONE] -->

    <string name="permlab_queryAllPackages">query all packages</string>

    <!-- Description of an application permission that lets it query all other packages. [CHAR LIMIT=NONE] -->

    <string name="permdesc_queryAllPackages">Allows an app to see all installed packages.</string>



    <!-- Title of an application permission that lets it access SupplementalApis. [CHAR LIMIT=NONE] -->

    <string name="permlab_accessSupplementalApi">access SupplementalApis</string>

    <!-- Description of an application permission that lets it access SupplementalApis. [CHAR LIMIT=NONE]-->

    <string name="permdesc_accessSupplementalApi">Allows an application to access SupplementalApis.</string>



    <!-- Shown in the tutorial for tap twice for zoom control. -->

    <string name="tutorial_double_tap_to_zoom_message_short">Tap twice for zoom control</string>