summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chong Zhang <chz@google.com> 2016-06-03 11:30:20 -0700
committer Chong Zhang <chz@google.com> 2016-06-03 11:50:44 -0700
commit6f9ae4ffc56919cba4f44a78af4d6864ea09e7c8 (patch)
treeabab6b48d3bbdcfe51bb14a9afa9d1bbe3ddf722
parentc4f1bc40326c10fde55f07230e3fe3067d70fbfa (diff)
Use getActivityToken() instead of mToken in isTopOfTask
mToken could be local tokan and causes IllegalArgumentException. bug: 29072444 Change-Id: I0f889a70a848ffea31663ed80337e1605c75223e
-rw-r--r--core/java/android/app/Activity.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index ac5f3effa1f9..a5fcec622956 100644
--- 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;
}