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

Commit c825f758 authored by yinxu's avatar yinxu Committed by android-build-merger
Browse files

Merge "Expose the onCarrierPrivilegedAppsChanged as SystemApi" 

am: 58ea8819

Change-Id: I34893a1c9ec19bddf7b429d65b9fb84f529d2b5c
parents 5a05ae12 58ea8819

api/system-current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -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 int getAppStandbyBucket(String);

    method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public java.util.Map<java.lang.String,java.lang.Integer> getAppStandbyBuckets();

    method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public java.util.Map<java.lang.String,java.lang.Integer> getAppStandbyBuckets();

    method public int getUsageSource();

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

    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 Original line Diff line number Diff line
@@ -1041,8 +1041,11 @@ public final class UsageStatsManager { 




    /**

    /**

     * Inform usage stats that the carrier privileged apps access rules have changed.

     * 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

     * @hide

     */

     */

    @SystemApi

    @RequiresPermission(android.Manifest.permission.BIND_CARRIER_SERVICES)

    public void onCarrierPrivilegedAppsChanged() {

    public void onCarrierPrivilegedAppsChanged() {

        try {

        try {

            mService.onCarrierPrivilegedAppsChanged();

            mService.onCarrierPrivilegedAppsChanged();