Commit 7b1447e5 authored Jan 23, 2018 by Selim Cinek

Fixed the case where the task was moved to the front

Previously in the case that the task was moved to the front,
the wrong result would be returned.

Test: go/wm-smoke
Test: Use PendingIntent.sendAndReturnResult
Change-Id: Ifa2966bacc4235f45b74220336f2baae02d0ee9a

parent a22b5a2e

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -1252,7 +1252,7 @@ class ActivityStarter {
		outActivity[0] = reusedActivity;
		}

		return START_DELIVERED_TO_TOP;
		return mMovedToFront ? START_TASK_TO_FRONT : START_DELIVERED_TO_TOP;
		}
		}