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

Commit bd39e731 authored by Michael Wachenschwanz's avatar Michael Wachenschwanz
Browse files

Remove old version of registerUsageSessionObserver 

Test: none
Fixes: 128455269
Change-Id: I23ac8db6b05e3f40dd83f87b85c19bd3bc873e48
parent 9943f8db

api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -1217,7 +1217,6 @@ package android.app.usage { 
    method public int getUsageSource();

    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 @Deprecated @RequiresPermission(android.Manifest.permission.OBSERVE_APP_USAGE) public void registerUsageSessionObserver(int, @NonNull String[], long, @NonNull java.util.concurrent.TimeUnit, long, @NonNull java.util.concurrent.TimeUnit, @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);

    method public void reportUsageStart(@NonNull android.app.Activity, @NonNull String);

    method public void reportUsageStart(@NonNull android.app.Activity, @NonNull String, long);

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

+0 −23
Original line number Diff line number Diff line
@@ -678,29 +678,6 @@ public final class UsageStatsManager { 
        }

    }





    /**

     * @deprecated use {@link #registerUsageSessionObserver(int, String[], Duration, Duration,

     *                                                      PendingIntent, PendingIntent)}.

     *

     * @hide

     */

    @Deprecated

    @SystemApi

    @RequiresPermission(android.Manifest.permission.OBSERVE_APP_USAGE)

    // STOPSHIP b/128455269: remove this method

    public void registerUsageSessionObserver(int sessionObserverId,

            @NonNull String[] observedEntities, long timeLimit, @NonNull TimeUnit timeUnit,

            long sessionThresholdTime,  @NonNull TimeUnit sessionThresholdTimeUnit,

            @NonNull PendingIntent limitReachedCallbackIntent,

            @Nullable PendingIntent sessionEndCallbackIntent) {

        final Duration timeLimitDuration = Duration.ofMillis(timeUnit.toMillis(timeLimit));

        final Duration sessionThresholdDuration =

                Duration.ofMillis(sessionThresholdTimeUnit.toMillis(sessionThresholdTime));

        registerUsageSessionObserver(sessionObserverId, observedEntities, timeLimitDuration,

                sessionThresholdDuration, limitReachedCallbackIntent, sessionEndCallbackIntent);

    }



    /**

     * Register a usage session observer that receives a callback on the provided {@code

     * limitReachedCallbackIntent} when the sum of usages of apps and tokens in the {@code