diff options
| author | George Mount <mount@google.com> | 2016-03-29 20:02:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-03-29 20:02:27 +0000 |
| commit | e6ef0f9d77efdd5852ac2e3d768280dc3571dcf7 (patch) | |
| tree | f6d1db5a07f3bafe938b92253ed425a12d7af7f6 /core/java | |
| parent | 58cf2c3da028c9e091eed03868eaaa38625b12b7 (diff) | |
| parent | d0ca0e09842221ac8c587eda8c0c25aff61dd6f2 (diff) | |
Merge "Ensure window has been added in isTopOfTask" into nyc-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/Activity.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 887932a7dbbb..0d387e660f8a 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -5920,6 +5920,9 @@ public class Activity extends ContextThemeWrapper * @return true if this is the topmost, non-finishing activity in its task. */ private boolean isTopOfTask() { + if (mToken == null || mWindow == null || !mWindowAdded) { + return false; + } try { return ActivityManagerNative.getDefault().isTopOfTask(mToken); } catch (RemoteException e) { |