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

Commit 428ecf29 authored by Craig Mautner's avatar Craig Mautner
Browse files

Remove unused method moveTaskToBack. 

Everyone uses moveActivityTaskToBack() instead.

Fixes item #3 of bug 18088522.

Change-Id: I16028335fe1eef8a2aa47804f46536e395a16d8c
parent 799bc1d3

core/java/android/app/ActivityManagerNative.java

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

        }



        case MOVE_TASK_TO_BACK_TRANSACTION: {

            data.enforceInterface(IActivityManager.descriptor);

            int task = data.readInt();

            moveTaskToBack(task);

            reply.writeNoException();

            return true;

        }



        case MOVE_ACTIVITY_TASK_TO_BACK_TRANSACTION: {

            data.enforceInterface(IActivityManager.descriptor);

            IBinder token = data.readStrongBinder();
@@ -3165,17 +3157,6 @@ class ActivityManagerProxy implements IActivityManager 
        data.recycle();

        reply.recycle();

    }

    public void moveTaskToBack(int task) throws RemoteException

    {

        Parcel data = Parcel.obtain();

        Parcel reply = Parcel.obtain();

        data.writeInterfaceToken(IActivityManager.descriptor);

        data.writeInt(task);

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

        reply.readException();

        data.recycle();

        reply.recycle();

    }

    public boolean moveActivityTaskToBack(IBinder token, boolean nonRoot)

            throws RemoteException {

        Parcel data = Parcel.obtain();

core/java/android/app/IActivityManager.java

+1 −2
Original line number Diff line number Diff line
@@ -131,7 +131,6 @@ public interface IActivityManager extends IInterface { 
    public List<ActivityManager.ProcessErrorStateInfo> getProcessesInErrorState()

            throws RemoteException;

    public void moveTaskToFront(int task, int flags, Bundle options) throws RemoteException;

    public void moveTaskToBack(int task) throws RemoteException;

    public boolean moveActivityTaskToBack(IBinder token, boolean nonRoot) throws RemoteException;

    public void moveTaskBackwards(int task) throws RemoteException;

    public void moveTaskToStack(int taskId, int stackId, boolean toTop) throws RemoteException;
@@ -598,7 +597,7 @@ public interface IActivityManager extends IInterface { 
    int GET_CALLING_ACTIVITY_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+21;

    int GET_TASKS_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+22;

    int MOVE_TASK_TO_FRONT_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+23;

    int MOVE_TASK_TO_BACK_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+24;



    int MOVE_TASK_BACKWARDS_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+25;

    int GET_TASK_FOR_ACTIVITY_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+26;

services/core/java/com/android/server/am/ActivityManagerService.java

+7 −37
Original line number Diff line number Diff line
@@ -8006,36 +8006,6 @@ public final class ActivityManagerService extends ActivityManagerNative 
        ActivityOptions.abort(options);

    }













    @Override













    public void moveTaskToBack(int taskId) {













        enforceCallingPermission(android.Manifest.permission.REORDER_TASKS,













                "moveTaskToBack()");

























        synchronized(this) {













            TaskRecord tr = mStackSupervisor.anyTaskForIdLocked(taskId);













            if (tr != null) {













                if (tr == mStackSupervisor.mLockTaskModeTask) {













                    mStackSupervisor.showLockTaskToast();













                    return;













                }













                if (DEBUG_STACK) Slog.d(TAG, "moveTaskToBack: moving task=" + tr);













                ActivityStack stack = tr.stack;













                if (stack.mResumedActivity != null && stack.mResumedActivity.task == tr) {













                    if (!checkAppSwitchAllowedLocked(Binder.getCallingPid(),













                            Binder.getCallingUid(), -1, -1, "Task to back")) {













                        return;













                    }













                }













                final long origId = Binder.clearCallingIdentity();













                try {













                    stack.moveTaskToBackLocked(taskId, null);













                } finally {













                    Binder.restoreCallingIdentity(origId);













                }













            }













        }













    }



























    /**















     * Moves an activity, and all of the other activities within the same task, to the bottom















     * of the history stack.  The activity's order within the task is unchanged.

































tests/permission/src/com/android/framework/permission/tests/ActivityManagerPermissionTests.java



+1
−11






























Original line number
Diff line number
Diff line








@@ -48,16 +48,6 @@ public class ActivityManagerPermissionTests extends TestCase {













            fail("Unexpected remote exception");















        }





























        try {













            mAm.moveTaskToBack(-1);













            fail("IActivityManager.moveTaskToBack did not throw SecurityException as"













                    + " expected");













        } catch (SecurityException e) {













            // expected













        } catch (RemoteException e) {













            fail("Unexpected remote exception");













        }













        















        try {















            mAm.moveTaskBackwards(-1);















            fail("IActivityManager.moveTaskToFront did not throw SecurityException as"