diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 1f20cb9c26f9e70de854040de3fc2ee5978a7871..a1da9e02f23d0744427dd0ea3cf664a2fb142968 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -314,7 +314,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 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"; diff --git a/core/java/android/app/usage/flags.aconfig b/core/java/android/app/usage/flags.aconfig index d1f90676a15f481e406dd8488e15303c5c287b7b..afe87de1dbf5f8c0072e0712d864815a3560513d 100644 --- a/core/java/android/app/usage/flags.aconfig +++ b/core/java/android/app/usage/flags.aconfig @@ -7,9 +7,3 @@ flag { bug: "296061232" } -flag { - name: "report_usage_stats_permission" - namespace: "backstage_power" - description: "Feature flag for the new REPORT_USAGE_STATS permission." - bug: "296056771" -} diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 84690a7a617d82444603f2156d3e45e012a9b592..a54a563b1804a9a76c2bd48e3de27275f0a824fd 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -6122,9 +6122,7 @@ android:protectionLevel="signature|privileged|development|appop|retailDemo" /> <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS" /> - <!-- @SystemApi @hide - @FlaggedApi("backstage_power.report_usage_stats_permission") - Allows trusted system components to report events to UsageStatsManager --> + <!-- @SystemApi @hide Allows trusted system components to report events to UsageStatsManager --> <permission android:name="android.permission.REPORT_USAGE_STATS" android:protectionLevel="signature|module" /> diff --git a/services/usage/java/com/android/server/usage/UsageStatsService.java b/services/usage/java/com/android/server/usage/UsageStatsService.java index 2e6278d9a75d3011c6b7dc2e9749580221a6c17c..1e09fce287407d762aa95afc0f21e59e274a663f 100644 --- a/services/usage/java/com/android/server/usage/UsageStatsService.java +++ b/services/usage/java/com/android/server/usage/UsageStatsService.java @@ -53,7 +53,6 @@ import android.app.usage.AppStandbyInfo; import android.app.usage.BroadcastResponseStatsList; import android.app.usage.ConfigurationStats; import android.app.usage.EventStats; -import android.app.usage.Flags; import android.app.usage.IUsageStatsManager; import android.app.usage.UsageEvents; import android.app.usage.UsageEvents.Event; @@ -2127,15 +2126,12 @@ public class UsageStatsService extends SystemService implements } private boolean canReportUsageStats() { - final boolean isSystem = isCallingUidSystem(); - if (!Flags.reportUsageStatsPermission()) { - // If the flag is disabled, do no check for the new permission and instead return - // true only if the calling uid is system since System UID can always report stats. - return isSystem; - } - return isSystem - || getContext().checkCallingPermission(Manifest.permission.REPORT_USAGE_STATS) - == PackageManager.PERMISSION_GRANTED; + if (isCallingUidSystem()) { + return true; // System UID can always report UsageStats + } + + return getContext().checkCallingPermission(Manifest.permission.REPORT_USAGE_STATS) + == PackageManager.PERMISSION_GRANTED; } private boolean hasObserverPermission() {