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

Commit 2db35570 authored by Winson Chung's avatar Winson Chung
Browse files

Pull out TaskStackListener into its own class. 

Bug: 67510855
Test: Code removal
Change-Id: I103ccc690f577dbeba9c3568614d9f4041fff7df
parent 545a6e1b

core/java/android/app/ActivityManager.java

+0 −16
Original line number Diff line number Diff line
@@ -1828,22 +1828,6 @@ public class ActivityManager { 
        }

    }



    /**

     * Completely remove the given task.

     *

     * @param taskId Identifier of the task to be removed.

     * @return Returns true if the given task was found and removed.

     *

     * @hide

     */

    public boolean removeTask(int taskId) throws SecurityException {

        try {

            return getService().removeTask(taskId);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    /**

     * Sets the windowing mode for a specific task. Only works on tasks of type

     * {@link WindowConfiguration#ACTIVITY_TYPE_STANDARD}

core/java/android/app/TaskStackListener.java

+3 −4
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ public abstract class TaskStackListener extends ITaskStackListener.Stub { 
    }



    @Override

    public void onTaskRemovalStarted(int taskId) {

    public void onTaskRemovalStarted(int taskId) throws RemoteException {

    }



    @Override
@@ -91,11 +91,10 @@ public abstract class TaskStackListener extends ITaskStackListener.Stub { 
    }



    @Override

    public void onTaskProfileLocked(int taskId, int userId) {

    public void onTaskProfileLocked(int taskId, int userId) throws RemoteException {

    }



    @Override

    public void onTaskSnapshotChanged(int taskId, TaskSnapshot snapshot)

            throws RemoteException {

    public void onTaskSnapshotChanged(int taskId, TaskSnapshot snapshot) throws RemoteException {

    }

}

packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java

+2 −3
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ import android.media.AudioManager; 
import android.os.BatteryManager;

import android.os.CancellationSignal;

import android.os.Handler;

import android.os.IBinder;

import android.os.IRemoteCallback;

import android.os.Message;

import android.os.RemoteException;
@@ -78,7 +77,7 @@ import com.android.internal.telephony.PhoneConstants; 
import com.android.internal.telephony.TelephonyIntents;

import com.android.internal.widget.LockPatternUtils;

import com.android.systemui.recents.misc.SystemServicesProxy;

import com.android.systemui.recents.misc.SystemServicesProxy.TaskStackListener;

import com.android.systemui.recents.misc.TaskStackChangeListener;



import com.google.android.collect.Lists;
@@ -1771,7 +1770,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { 
        }

    }



    private final TaskStackListener mTaskStackListener = new TaskStackListener() {

    private final TaskStackChangeListener mTaskStackListener = new TaskStackChangeListener() {

        @Override

        public void onTaskStackChangedBackground() {

            try {

packages/SystemUI/src/com/android/systemui/keyguard/WorkLockActivityController.java

+2 −4
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.systemui.keyguard;



import android.app.Activity;

import android.app.ActivityManager;

import android.app.ActivityOptions;

import android.app.IActivityManager;
@@ -29,9 +28,8 @@ import android.os.RemoteException; 
import android.os.UserHandle;



import com.android.internal.annotations.VisibleForTesting;

import com.android.systemui.recents.events.EventBus;

import com.android.systemui.recents.misc.SystemServicesProxy;

import com.android.systemui.recents.misc.SystemServicesProxy.TaskStackListener;

import com.android.systemui.recents.misc.TaskStackChangeListener;



public class WorkLockActivityController {

    private final Context mContext;
@@ -98,7 +96,7 @@ public class WorkLockActivityController { 
        }

    }



    private final TaskStackListener mLockListener = new TaskStackListener() {

    private final TaskStackChangeListener mLockListener = new TaskStackChangeListener() {

        @Override

        public void onTaskProfileLocked(int taskId, int userId) {

            startWorkChallengeInTask(taskId, userId);

packages/SystemUI/src/com/android/systemui/pip/phone/PipManager.java

+2 −3
Original line number Diff line number Diff line
@@ -41,8 +41,7 @@ import com.android.systemui.pip.BasePipManager; 
import com.android.systemui.recents.events.EventBus;

import com.android.systemui.recents.events.component.ExpandPipEvent;

import com.android.systemui.recents.misc.SystemServicesProxy;

import com.android.systemui.recents.misc.SystemServicesProxy.TaskStackListener;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.recents.misc.TaskStackChangeListener;



import java.io.PrintWriter;
@@ -70,7 +69,7 @@ public class PipManager implements BasePipManager { 
    /**

     * Handler for system task stack changes.

     */

    TaskStackListener mTaskStackListener = new TaskStackListener() {

    TaskStackChangeListener mTaskStackListener = new TaskStackChangeListener() {

        @Override

        public void onActivityPinned(String packageName, int userId, int taskId, int stackId) {

            mTouchHandler.onActivityPinned();