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

Commit 57f7a148 authored by Bryce Lee's avatar Bryce Lee Committed by android-build-merger
Browse files

Merge "Deprecate ActivityManager#getRunningServices" into oc-dev am: 25b76877 

am: 178fe0d0

Change-Id: Id6c0c4f36d29071497d43f36bdc8a87ade9a2e43
parents 6d0a0cab 178fe0d0

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -3848,7 +3848,7 @@ package android.app { 
    method public deprecated java.util.List<android.app.ActivityManager.RecentTaskInfo> getRecentTasks(int, int) throws java.lang.SecurityException;

    method public java.util.List<android.app.ActivityManager.RunningAppProcessInfo> getRunningAppProcesses();

    method public android.app.PendingIntent getRunningServiceControlPanel(android.content.ComponentName) throws java.lang.SecurityException;

    method public java.util.List<android.app.ActivityManager.RunningServiceInfo> getRunningServices(int) throws java.lang.SecurityException;

    method public deprecated java.util.List<android.app.ActivityManager.RunningServiceInfo> getRunningServices(int) throws java.lang.SecurityException;

    method public deprecated java.util.List<android.app.ActivityManager.RunningTaskInfo> getRunningTasks(int) throws java.lang.SecurityException;

    method public deprecated boolean isInLockTaskMode();

    method public boolean isLowRamDevice();

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -3989,7 +3989,7 @@ package android.app { 
    method public deprecated java.util.List<android.app.ActivityManager.RecentTaskInfo> getRecentTasks(int, int) throws java.lang.SecurityException;

    method public java.util.List<android.app.ActivityManager.RunningAppProcessInfo> getRunningAppProcesses();

    method public android.app.PendingIntent getRunningServiceControlPanel(android.content.ComponentName) throws java.lang.SecurityException;

    method public java.util.List<android.app.ActivityManager.RunningServiceInfo> getRunningServices(int) throws java.lang.SecurityException;

    method public deprecated java.util.List<android.app.ActivityManager.RunningServiceInfo> getRunningServices(int) throws java.lang.SecurityException;

    method public deprecated java.util.List<android.app.ActivityManager.RunningTaskInfo> getRunningTasks(int) throws java.lang.SecurityException;

    method public int getUidImportance(int);

    method public deprecated boolean isInLockTaskMode();

api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -3852,7 +3852,7 @@ package android.app { 
    method public deprecated java.util.List<android.app.ActivityManager.RecentTaskInfo> getRecentTasks(int, int) throws java.lang.SecurityException;

    method public java.util.List<android.app.ActivityManager.RunningAppProcessInfo> getRunningAppProcesses();

    method public android.app.PendingIntent getRunningServiceControlPanel(android.content.ComponentName) throws java.lang.SecurityException;

    method public java.util.List<android.app.ActivityManager.RunningServiceInfo> getRunningServices(int) throws java.lang.SecurityException;

    method public deprecated java.util.List<android.app.ActivityManager.RunningServiceInfo> getRunningServices(int) throws java.lang.SecurityException;

    method public deprecated java.util.List<android.app.ActivityManager.RunningTaskInfo> getRunningTasks(int) throws java.lang.SecurityException;

    method public int getUidImportance(int);

    method public deprecated boolean isInLockTaskMode();

core/java/android/app/ActivityManager.java

+5 −0
Original line number Diff line number Diff line
@@ -2580,6 +2580,10 @@ public class ActivityManager { 
     * <p><b>Note: this method is only intended for debugging or implementing

     * service management type user interfaces.</b></p>

     *

     * @deprecated As of {@link android.os.Build.VERSION_CODES#O}, this method

     * is no longer available to third party applications.  For backwards compatibility,

     * it will still return the caller's own services.

     *

     * @param maxNum The maximum number of entries to return in the list.  The

     * actual number returned may be smaller, depending on how many services

     * are running.
@@ -2587,6 +2591,7 @@ public class ActivityManager { 
     * @return Returns a list of RunningServiceInfo records describing each of

     * the running tasks.

     */

    @Deprecated

    public List<RunningServiceInfo> getRunningServices(int maxNum)

            throws SecurityException {

        try {