Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Android Build Merger (Role)
2016-06-08 01:27:43 +00:00
committed by Android (Google) Code Review
parent 02e2d72d55 456fc8cd3c
commit c6a520e090
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/app/Activity.java
View File

@@ -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;
}