Merge "Use getActivityToken() instead of mToken in isTopOfTask" into nyc-dev

diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index ac5f3ef..a5fcec6 100644 (file)
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -5952,7 +5952,7 @@ public class Activity extends ContextThemeWrapper
             return false;
         }
         try {
-            return ActivityManagerNative.getDefault().isTopOfTask(mToken);
+            return ActivityManagerNative.getDefault().isTopOfTask(getActivityToken());
         } catch (RemoteException e) {
             return false;
         }