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

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

Merge "Make Lock Task API public."

parents 9d75ccb6 a57e5e00

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -3363,10 +3363,12 @@ package android.app { 
    method public void startIntentSenderForResult(android.content.IntentSender, int, android.content.Intent, int, int, int, android.os.Bundle) throws android.content.IntentSender.SendIntentException;

    method public void startIntentSenderFromChild(android.app.Activity, android.content.IntentSender, int, android.content.Intent, int, int, int) throws android.content.IntentSender.SendIntentException;

    method public void startIntentSenderFromChild(android.app.Activity, android.content.IntentSender, int, android.content.Intent, int, int, int, android.os.Bundle) throws android.content.IntentSender.SendIntentException;

    method public void startLockTask();

    method public deprecated void startManagingCursor(android.database.Cursor);

    method public boolean startNextMatchingActivity(android.content.Intent);

    method public boolean startNextMatchingActivity(android.content.Intent, android.os.Bundle);

    method public void startSearch(java.lang.String, boolean, android.os.Bundle, boolean);

    method public void stopLockTask();

    method public deprecated void stopManagingCursor(android.database.Cursor);

    method public void takeKeyEvents(boolean);

    method public void triggerSearch(java.lang.String, android.os.Bundle);

core/java/android/app/Activity.java

+20 −2
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import com.android.internal.policy.PolicyManager; 


import android.annotation.IntDef;

import android.annotation.Nullable;

import android.app.admin.DevicePolicyManager;

import android.content.ComponentCallbacks2;

import android.content.ComponentName;

import android.content.ContentResolver;
@@ -5689,7 +5690,16 @@ public class Activity extends ContextThemeWrapper 
        }

    }



    /** @hide */

    /**

     * Put this Activity in a mode where the user is locked to the

     * current task.

     *

     * This will prevent the user from launching other apps, going to settings,

     * or reaching the home screen.

     *

     * Lock task mode will only start if the activity has been whitelisted by the

     * Device Owner through {@link DevicePolicyManager#setLockTaskComponents}.

     */

    public void startLockTask() {

        try {

            ActivityManagerNative.getDefault().startLockTaskMode(mToken);
@@ -5697,7 +5707,15 @@ public class Activity extends ContextThemeWrapper 
        }

    }



    /** @hide */

    /**

     * Allow the user to switch away from the current task.

     *

     * Called to end the mode started by {@link Activity#startLockTask}. This

     * can only be called by activities that have successfully called

     * startLockTask previously.

     *

     * This will allow the user to exit this app and move onto other activities.

     */

    public void stopLockTask() {

        try {

            ActivityManagerNative.getDefault().stopLockTaskMode();