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

Commit e1474f6c authored by Dmitri Plotnikov's avatar Dmitri Plotnikov Committed by Android (Google) Code Review
Browse files

Merge "Declare permission for fine-grained power monitor access" into main

parents b4a842c7 bdefdd9b

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ package android { 
    field @FlaggedApi("android.app.contextualsearch.flags.enable_service") public static final String ACCESS_CONTEXTUAL_SEARCH = "android.permission.ACCESS_CONTEXTUAL_SEARCH";

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

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

    field @FlaggedApi("android.permission.flags.fine_power_monitor_permission") public static final String ACCESS_FINE_POWER_MONITORS = "android.permission.ACCESS_FINE_POWER_MONITORS";

    field @Deprecated public static final String ACCESS_FM_RADIO = "android.permission.ACCESS_FM_RADIO";

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

    field @FlaggedApi("android.multiuser.enable_permission_to_access_hidden_profiles") public static final String ACCESS_HIDDEN_PROFILES_FULL = "android.permission.ACCESS_HIDDEN_PROFILES_FULL";

core/java/android/permission/flags.aconfig

+10 −0
Original line number Diff line number Diff line
@@ -492,3 +492,13 @@ flag { 
    description: "This flag is used to enable the role system_vendor_intelligence"

    bug: "377553620"

}



flag {

    name: "fine_power_monitor_permission"

    is_fixed_read_only: true

    is_exported: true

    namespace: "permissions"

    description: "Add support for fine-grained PowerMonitor readings"

    bug: "341941666"

}

core/res/AndroidManifest.xml

+7 −0
Original line number Diff line number Diff line
@@ -6853,6 +6853,13 @@ 
    <permission android:name="android.permission.BATTERY_STATS"

        android:protectionLevel="signature|privileged|development" />



    <!-- @SystemApi @hide Allows an application to collect high-precision PowerMonitor readings

         <p>Protection level: signature|privileged|development

         @FlaggedApi(android.permission.flags.Flags.FLAG_FINE_POWER_MONITOR_PERMISSION) -->

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

        android:protectionLevel="signature|privileged|development"

        android:featureFlag="android.permission.flags.fine_power_monitor_permission" />



    <!--Allows an application to manage statscompanion.

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

         @hide -->