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

Commit 054834f1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove the @remove from the deprecated registerUsageSessionObserver"

parents 40db21ea 1e693041

api/system-current.txt

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

api/system-removed.txt

+0 −8
Original line number Diff line number Diff line
@@ -28,14 +28,6 @@ package android.app.admin { 


}



package android.app.usage {



  public final class UsageStatsManager {

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

  }



}



package android.content {



  public class Intent implements java.lang.Cloneable android.os.Parcelable {

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

+0 −1
Original line number Diff line number Diff line
@@ -665,7 +665,6 @@ public final class UsageStatsManager { 
     * @deprecated use {@link #registerUsageSessionObserver(int, String[], Duration, Duration,

     *                                                      PendingIntent, PendingIntent)}.

     *

     * @removed

     * @hide

     */

    @Deprecated