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

am: 723e5afa9e Change-Id: I12f294f42e135fc181f585c515cd9ad4589ac1f2
2016-06-08 01:19:03 +00:00
parent 9d178342d8 723e5afa9e
commit 1895addcef
1 changed files with 1 additions and 1 deletions
--- 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;
        }