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

Commit 8fd3800e authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Add missing lock task API" into lmp-dev

parents 85cfec81 386c94fd

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -3512,6 +3512,7 @@ package android.app { 
    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.RunningTaskInfo> getRunningTasks(int) throws java.lang.SecurityException;

    method public boolean isInLockTaskMode();

    method public boolean isLowRamDevice();

    method public static boolean isRunningInTestHarness();

    method public static boolean isUserAMonkey();

core/java/android/app/ActivityManager.java

+4 −1
Original line number Diff line number Diff line
@@ -2456,7 +2456,10 @@ public class ActivityManager { 
    }



    /**

     * @hide

     * Return whether currently in lock task mode.  When in this mode

     * no new tasks can be created or switched to.

     *

     * @see Activity#startLockTask()

     */

    public boolean isInLockTaskMode() {

        try {