diff options
| author | 2019-12-16 18:40:50 +0000 | |
|---|---|---|
| committer | 2019-12-16 18:40:50 +0000 | |
| commit | 58ea8819f5523f54f2153f04eb44b94a1aff0995 (patch) | |
| tree | 98b0bd95eb1efa806152efc7d00b87390f7ab68f | |
| parent | 07ba9c6fff7e2298fba7ef351fa8cf07dc43edaf (diff) | |
| parent | 4631f7231fd149774c1a71e96bc2f9c1a97c820f (diff) | |
Merge "Expose the onCarrierPrivilegedAppsChanged as SystemApi"
| -rwxr-xr-x | api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/app/usage/UsageStatsManager.java | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 9b8e8472be5c..a41564e37cc3 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -1226,6 +1226,7 @@ package android.app.usage { method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public int getAppStandbyBucket(String); method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public java.util.Map<java.lang.String,java.lang.Integer> getAppStandbyBuckets(); method public int getUsageSource(); + method @RequiresPermission(android.Manifest.permission.BIND_CARRIER_SERVICES) public void onCarrierPrivilegedAppsChanged(); method @RequiresPermission(allOf={android.Manifest.permission.SUSPEND_APPS, android.Manifest.permission.OBSERVE_APP_USAGE}) public void registerAppUsageLimitObserver(int, @NonNull String[], @NonNull java.time.Duration, @NonNull java.time.Duration, @Nullable android.app.PendingIntent); method @RequiresPermission(android.Manifest.permission.OBSERVE_APP_USAGE) public void registerAppUsageObserver(int, @NonNull String[], long, @NonNull java.util.concurrent.TimeUnit, @NonNull android.app.PendingIntent); method @RequiresPermission(android.Manifest.permission.OBSERVE_APP_USAGE) public void registerUsageSessionObserver(int, @NonNull String[], @NonNull java.time.Duration, @NonNull java.time.Duration, @NonNull android.app.PendingIntent, @Nullable android.app.PendingIntent); diff --git a/core/java/android/app/usage/UsageStatsManager.java b/core/java/android/app/usage/UsageStatsManager.java index 749a011153cd..92e1b30793c9 100644 --- a/core/java/android/app/usage/UsageStatsManager.java +++ b/core/java/android/app/usage/UsageStatsManager.java @@ -1041,8 +1041,11 @@ public final class UsageStatsManager { /** * Inform usage stats that the carrier privileged apps access rules have changed. + * <p> The caller must have {@link android.Manifest.permission#BIND_CARRIER_SERVICES} </p> * @hide */ + @SystemApi + @RequiresPermission(android.Manifest.permission.BIND_CARRIER_SERVICES) public void onCarrierPrivilegedAppsChanged() { try { mService.onCarrierPrivilegedAppsChanged(); |