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

Commit ad48a441 authored by Varun Shah's avatar Varun Shah Committed by Android (Google) Code Review
Browse files

Merge "Update the fully qualified flag name." into main

parents 09232ed9 7079c93d

core/api/system-current.txt

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

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

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

    field @FlaggedApi("backstage_power.report_usage_stats_permission") public static final String REPORT_USAGE_STATS = "android.permission.REPORT_USAGE_STATS";

    field @FlaggedApi("android.app.usage.report_usage_stats_permission") public static final String REPORT_USAGE_STATS = "android.permission.REPORT_USAGE_STATS";

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

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

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

core/res/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -6123,7 +6123,7 @@ 
    <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS" />



    <!-- @SystemApi @hide

         @FlaggedApi("backstage_power.report_usage_stats_permission")

         @FlaggedApi("android.app.usage.report_usage_stats_permission")

         Allows trusted system components to report events to UsageStatsManager -->

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

                android:protectionLevel="signature|module" />