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

Commit be82be6e authored by Sudheer Shanka's avatar Sudheer Shanka
Browse files

Add ACCESS_BROADCAST_RESPONSE_STATS permission. 

Instead of re-using PACKAGE_USAGE_STATS permission,
we are creating a new permission to guard access to
broadcast response stats.

For now, we check both permissions until the clients
migrate to using the new permission.

Bug: 225039700
Test: atest tests/tests/app.usage/src/android/app/usage/cts/UsageStatsTest.java
Change-Id: I65965b647da5994f434167693df999bc939807e2
parent 8fb55d41

core/api/system-current.txt

+3 −2
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ package android { 
    field public static final String ACCESS_AMBIENT_CONTEXT_EVENT = "android.permission.ACCESS_AMBIENT_CONTEXT_EVENT";

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

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

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

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

    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";
@@ -2620,13 +2621,13 @@ package android.app.usage { 
  }















  public final class UsageStatsManager {













    method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public void clearBroadcastResponseStats(@Nullable String, @IntRange(from=0) long);













    method @RequiresPermission(android.Manifest.permission.ACCESS_BROADCAST_RESPONSE_STATS) public void clearBroadcastResponseStats(@Nullable String, @IntRange(from=0) long);















    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 @RequiresPermission(allOf={android.Manifest.permission.INTERACT_ACROSS_USERS, android.Manifest.permission.PACKAGE_USAGE_STATS}) public long getLastTimeAnyComponentUsed(@NonNull String);















    method public int getUsageSource();















    method @RequiresPermission(android.Manifest.permission.BIND_CARRIER_SERVICES) public void onCarrierPrivilegedAppsChanged();













    method @NonNull @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public java.util.List<android.app.usage.BroadcastResponseStats> queryBroadcastResponseStats(@Nullable String, @IntRange(from=0) long);













    method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_BROADCAST_RESPONSE_STATS) public java.util.List<android.app.usage.BroadcastResponseStats> queryBroadcastResponseStats(@Nullable String, @IntRange(from=0) long);















    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);

























core/java/android/app/usage/IUsageStatsManager.aidl



+3
−3




























Original line number
Diff line number
Diff line








@@ -74,12 +74,12 @@ interface IUsageStatsManager {













    int getUsageSource();















    void forceUsageSourceSettingRead();















    long getLastTimeAnyComponentUsed(String packageName, String callingPackage);













    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS)")













    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.ACCESS_BROADCAST_RESPONSE_STATS)")















    BroadcastResponseStatsList queryBroadcastResponseStats(















            String packageName, long id, String callingPackage, int userId);













    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS)")













    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.ACCESS_BROADCAST_RESPONSE_STATS)")















    void clearBroadcastResponseStats(String packageName, long id, String callingPackage,















            int userId);













    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS)")













    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.ACCESS_BROADCAST_RESPONSE_STATS)")















    void clearBroadcastEvents(String callingPackage, int userId);















}
























core/java/android/app/usage/UsageStatsManager.java



+3
−3




























Original line number
Diff line number
Diff line








@@ -1446,7 +1446,7 @@ public final class UsageStatsManager {













     * @hide















     */















    @SystemApi













    @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS)













    @RequiresPermission(android.Manifest.permission.ACCESS_BROADCAST_RESPONSE_STATS)















    @UserHandleAware















    @NonNull















    public List<BroadcastResponseStats> queryBroadcastResponseStats(










@@ -1479,7 +1479,7 @@ public final class UsageStatsManager {













     * @hide















     */















    @SystemApi













    @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS)













    @RequiresPermission(android.Manifest.permission.ACCESS_BROADCAST_RESPONSE_STATS)















    @UserHandleAware















    public void clearBroadcastResponseStats(@Nullable String packageName,















            @IntRange(from = 0) long id) {









@@ -1496,7 +1496,7 @@ public final class UsageStatsManager {













     *















     * @hide















     */













    @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS)













    @RequiresPermission(android.Manifest.permission.ACCESS_BROADCAST_RESPONSE_STATS)















    @UserHandleAware















    public void clearBroadcastEvents() {















        try {

































core/res/AndroidManifest.xml



+8
−0




























Original line number
Diff line number
Diff line








@@ -5143,6 +5143,14 @@













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















    <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS" />





























    <!-- Allows an application to query broadcast response stats (see













         {@link android.app.usage.BroadcastResponseStats}).













         @SystemApi













         @hide













    -->













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













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





























    <!-- Allows a data loader to read a package's access logs. The access logs contain the















         set of pages referenced over time.















         <p>Declaring the permission implies intention to use the API and the user of the

































services/core/java/com/android/server/am/ActivityManagerService.java



+7
−2




























Original line number
Diff line number
Diff line








@@ -13455,10 +13455,15 @@ public class ActivityManagerService extends IActivityManager.Stub













            }





























            if (brOptions.getIdForResponseEvent() > 0) {













                // STOPSHIP (206518114): Temporarily check for PACKAGE_USAGE_STATS permission as













                // well until the clients switch to using the new permission.













                if (checkPermission(android.Manifest.permission.ACCESS_BROADCAST_RESPONSE_STATS,













                        callingPid, callingUid) != PERMISSION_GRANTED) {















                    enforceUsageStatsPermission(callerPackage, callingUid, callingPid,















                            "recordResponseEventWhileInBackground()");















                }















            }













        }





























        // Verify that protected broadcasts are only being sent by system code,















        // and that system code is only sending protected broadcasts.