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

Commit d95fc2d4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Added label for REQUEST_IGNORE_BATTERY_OPTIMIZATIONS permission." into nyc-mr2-dev

parents 7ba6d21a 965f4265

core/res/AndroidManifest.xml

+2 −0
Original line number Diff line number Diff line
@@ -2682,6 +2682,8 @@ 
         This is a normal permission: an app requesting it will always be granted the

         permission, without the user needing to approve or see it. -->

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

        android:label="@string/permlab_requestIgnoreBatteryOptimizations"

        android:description="@string/permdesc_requestIgnoreBatteryOptimizations"

        android:protectionLevel="normal" />



    <!-- @SystemApi Allows an application to collect battery statistics -->

core/res/res/values/strings.xml

+5 −0
Original line number Diff line number Diff line
@@ -3237,6 +3237,11 @@ 
    <!-- Description of an application permission that lets it read install sessions. -->

    <string name="permdesc_requestInstallPackages">Allows an application to request installation of packages.</string>



    <!-- Title of an application permission that lets it ask user to ignore battery optimizations for that app. -->

    <string name="permlab_requestIgnoreBatteryOptimizations">ask to ignore battery optimizations</string>

    <!-- 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>



    <!-- 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>