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

Commit 3ddd328c authored by Ying Xu's avatar Ying Xu Committed by Android (Google) Code Review
Browse files

Merge "Expose the onCarrierPrivilegedAppsChanged as SystemApi"

parents 37ebb65c 0016eefe

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1305,6 +1305,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);

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

+3 −0
Original line number Diff line number Diff line
@@ -1125,8 +1125,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();