Commit 25007ec4 authored Jun 08, 2016 by Chong Zhang Committed by android-build-merger Jun 08, 2016

Merge \"Merge \\\"Use getActivityToken() instead of mToken in isTopOfTask\\\"...

Merge \"Merge \\\"Use getActivityToken() instead of mToken in isTopOfTask\\\" into nyc-dev am: 723e5afa am: 1895addc\" into nyc-mr1-dev-plus-aosp
am: c6a520e0

Change-Id: If5550e5db119b201228c391e049d54f3760cca31

parents 61da879b c6a520e0

core/java/android/app/Activity.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -5956,7 +5956,7 @@ public class Activity extends ContextThemeWrapper
		return false;
		}
		try {
		return ActivityManagerNative.getDefault().isTopOfTask(mToken);
		return ActivityManagerNative.getDefault().isTopOfTask(getActivityToken());
		} catch (RemoteException e) {
		return false;
		}