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

Commit ce741680 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Prevent restoring task when updating task"

parents f9cf8728 5d339f00

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

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




package com.android.server.am;

package com.android.server.am;





import static com.android.server.am.ActivityStackSupervisor.MATCH_TASK_IN_STACKS_OR_RECENT_TASKS;

import static com.android.server.am.ActivityStackSupervisor.REMOVE_FROM_RECENTS;

import static com.android.server.am.ActivityStackSupervisor.REMOVE_FROM_RECENTS;





import android.app.ActivityManager;

import android.app.ActivityManager;
@@ -76,7 +77,8 @@ class AppTaskImpl extends IAppTask.Stub { 
        synchronized (mService) {

        synchronized (mService) {

            long origId = Binder.clearCallingIdentity();

            long origId = Binder.clearCallingIdentity();

            try {

            try {

                TaskRecord tr = mService.mStackSupervisor.anyTaskForIdLocked(mTaskId);

                TaskRecord tr = mService.mStackSupervisor.anyTaskForIdLocked(mTaskId,

                        MATCH_TASK_IN_STACKS_OR_RECENT_TASKS);

                if (tr == null) {

                if (tr == null) {

                    throw new IllegalArgumentException("Unable to find task ID " + mTaskId);

                    throw new IllegalArgumentException("Unable to find task ID " + mTaskId);

                }

                }
@@ -110,7 +112,8 @@ class AppTaskImpl extends IAppTask.Stub { 
        TaskRecord tr;

        TaskRecord tr;

        IApplicationThread appThread;

        IApplicationThread appThread;

        synchronized (mService) {

        synchronized (mService) {

            tr = mService.mStackSupervisor.anyTaskForIdLocked(mTaskId);

            tr = mService.mStackSupervisor.anyTaskForIdLocked(mTaskId,

                    MATCH_TASK_IN_STACKS_OR_RECENT_TASKS);

            if (tr == null) {

            if (tr == null) {

                throw new IllegalArgumentException("Unable to find task ID " + mTaskId);

                throw new IllegalArgumentException("Unable to find task ID " + mTaskId);

            }

            }
@@ -131,7 +134,8 @@ class AppTaskImpl extends IAppTask.Stub { 
        synchronized (mService) {

        synchronized (mService) {

            long origId = Binder.clearCallingIdentity();

            long origId = Binder.clearCallingIdentity();

            try {

            try {

                TaskRecord tr = mService.mStackSupervisor.anyTaskForIdLocked(mTaskId);

                TaskRecord tr = mService.mStackSupervisor.anyTaskForIdLocked(mTaskId,

                        MATCH_TASK_IN_STACKS_OR_RECENT_TASKS);

                if (tr == null) {

                if (tr == null) {

                    throw new IllegalArgumentException("Unable to find task ID " + mTaskId);

                    throw new IllegalArgumentException("Unable to find task ID " + mTaskId);

                }

                }