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

Commit 43261140 authored by Benjamin Franz's avatar Benjamin Franz
Browse files

Clean up the lock task APIs for COSU devices. 

Clean up and increase readability of internal handling of lock task mode APIs.
Add a public API to query the lock task mode state with pinned and locked as
possible outcomes. Additionally, change wording in lock task toasts when in
locked mode and update the javadoc regarding onLockTaskModeEntering and
onLockTaskModeExiting to represent the actual behaviour.

Bug: 19377096
Change-Id: Ia563078ca6ef6d6fc7e75130e6b94ba18af69340
parent 37828821

api/current.txt

+5 −1
Original line number Diff line number Diff line
@@ -3545,6 +3545,7 @@ package android.app { 
    method public int getLargeMemoryClass();

    method public int getLauncherLargeIconDensity();

    method public int getLauncherLargeIconSize();

    method public int getLockTaskModeState();

    method public int getMemoryClass();

    method public void getMemoryInfo(android.app.ActivityManager.MemoryInfo);

    method public static void getMyMemoryState(android.app.ActivityManager.RunningAppProcessInfo);
@@ -3555,7 +3556,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 deprecated boolean isInLockTaskMode();

    method public boolean isLowRamDevice();

    method public static boolean isRunningInTestHarness();

    method public static boolean isUserAMonkey();
@@ -3563,6 +3564,9 @@ package android.app { 
    method public void moveTaskToFront(int, int);

    method public void moveTaskToFront(int, int, android.os.Bundle);

    method public deprecated void restartPackage(java.lang.String);

    field public static final int LOCK_TASK_MODE_LOCKED = 1; // 0x1

    field public static final int LOCK_TASK_MODE_NONE = 0; // 0x0

    field public static final int LOCK_TASK_MODE_PINNED = 2; // 0x2

    field public static final java.lang.String META_HOME_ALTERNATE = "android.app.home.alternate";

    field public static final int MOVE_TASK_NO_USER_ACTION = 2; // 0x2

    field public static final int MOVE_TASK_WITH_HOME = 1; // 0x1

api/system-current.txt

+5 −1
Original line number Diff line number Diff line
@@ -3633,6 +3633,7 @@ package android.app { 
    method public int getLargeMemoryClass();

    method public int getLauncherLargeIconDensity();

    method public int getLauncherLargeIconSize();

    method public int getLockTaskModeState();

    method public int getMemoryClass();

    method public void getMemoryInfo(android.app.ActivityManager.MemoryInfo);

    method public static void getMyMemoryState(android.app.ActivityManager.RunningAppProcessInfo);
@@ -3643,7 +3644,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 deprecated boolean isInLockTaskMode();

    method public boolean isLowRamDevice();

    method public static boolean isRunningInTestHarness();

    method public static boolean isUserAMonkey();
@@ -3651,6 +3652,9 @@ package android.app { 
    method public void moveTaskToFront(int, int);

    method public void moveTaskToFront(int, int, android.os.Bundle);

    method public deprecated void restartPackage(java.lang.String);

    field public static final int LOCK_TASK_MODE_LOCKED = 1; // 0x1

    field public static final int LOCK_TASK_MODE_NONE = 0; // 0x0

    field public static final int LOCK_TASK_MODE_PINNED = 2; // 0x2

    field public static final java.lang.String META_HOME_ALTERNATE = "android.app.home.alternate";

    field public static final int MOVE_TASK_NO_USER_ACTION = 2; // 0x2

    field public static final int MOVE_TASK_WITH_HOME = 1; // 0x1

core/java/android/app/ActivityManager.java

+30 −2
Original line number Diff line number Diff line
@@ -309,6 +309,21 @@ public class ActivityManager { 
    /** @hide Process is being cached for later use and is empty. */

    public static final int PROCESS_STATE_CACHED_EMPTY = 13;



    /**

     * Lock task mode is not active.

     */

    public static final int LOCK_TASK_MODE_NONE = 0;



    /**

     * Full lock task mode is active.

     */

    public static final int LOCK_TASK_MODE_LOCKED = 1;



    /**

     * App pinning mode is active.

     */

    public static final int LOCK_TASK_MODE_PINNED = 2;



    Point mAppTaskThumbnailSize;



    /*package*/ ActivityManager(Context context, Handler handler) {
@@ -2684,12 +2699,25 @@ public class ActivityManager { 
     * no new tasks can be created or switched to.

     *

     * @see Activity#startLockTask()

     *

     * @deprecated Use {@link #getLockTaskModeState} instead.

     */

    public boolean isInLockTaskMode() {

        return getLockTaskModeState() != LOCK_TASK_MODE_NONE;

    }



    /**

     * Return the current state of task locking. The three possible outcomes

     * are {@link #LOCK_TASK_MODE_NONE}, {@link #LOCK_TASK_MODE_LOCKED}

     * and {@link #LOCK_TASK_MODE_PINNED}.

     *

     * @see Activity#startLockTask()

     */

    public int getLockTaskModeState() {

        try {

            return ActivityManagerNative.getDefault().isInLockTaskMode();

            return ActivityManagerNative.getDefault().getLockTaskModeState();

        } catch (RemoteException e) {

            return false;

            return ActivityManager.LOCK_TASK_MODE_NONE;

        }

    }

core/java/android/app/ActivityManagerNative.java

+21 −0
Original line number Diff line number Diff line
@@ -2294,6 +2294,14 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM 
            return true;

        }



        case GET_LOCK_TASK_MODE_STATE_TRANSACTION: {

            data.enforceInterface(IActivityManager.descriptor);

            final int lockTaskModeState = getLockTaskModeState();

            reply.writeNoException();

            reply.writeInt(lockTaskModeState);

            return true;

        }



        case SET_TASK_DESCRIPTION_TRANSACTION: {

            data.enforceInterface(IActivityManager.descriptor);

            IBinder token = data.readStrongBinder();
@@ -5419,6 +5427,19 @@ class ActivityManagerProxy implements IActivityManager 
        return isInLockTaskMode;

    }



    @Override

    public int getLockTaskModeState() throws RemoteException {

        Parcel data = Parcel.obtain();

        Parcel reply = Parcel.obtain();

        data.writeInterfaceToken(IActivityManager.descriptor);

        mRemote.transact(GET_LOCK_TASK_MODE_STATE_TRANSACTION, data, reply, 0);

        reply.readException();

        int lockTaskModeState = reply.readInt();

        data.recycle();

        reply.recycle();

        return lockTaskModeState;

    }



    @Override

    public void setTaskDescription(IBinder token, ActivityManager.TaskDescription values)

            throws RemoteException {

core/java/android/app/IActivityManager.java

+3 −0
Original line number Diff line number Diff line
@@ -461,6 +461,8 @@ public interface IActivityManager extends IInterface { 


    public boolean isInLockTaskMode() throws RemoteException;



    public int getLockTaskModeState() throws RemoteException;



    public void setTaskDescription(IBinder token, ActivityManager.TaskDescription values)

            throws RemoteException;

    public void setTaskResizeable(int taskId, boolean resizeable) throws RemoteException;
@@ -810,4 +812,5 @@ public interface IActivityManager extends IInterface { 
    int SET_TASK_RESIZEABLE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+283;

    int REQUEST_ASSIST_CONTEXT_EXTRAS_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+284;

    int RESIZE_TASK_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+285;

    int GET_LOCK_TASK_MODE_STATE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+286;

}