commit e6ef0f9d77efdd5852ac2e3d768280dc3571dcf7
author George Mount <mount@google.com> Tue Mar 29 20:02:25 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 29 20:02:27 2016 +0000
tree f6d1db5a07f3bafe938b92253ed425a12d7af7f6
parent 58cf2c3da028c9e091eed03868eaaa38625b12b7
parent d0ca0e09842221ac8c587eda8c0c25aff61dd6f2

Merge "Ensure window has been added in isTopOfTask" into nyc-dev

core/java/android/app/Activity.java

diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index 887932a..0d387e6 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -5920,6 +5920,9 @@
      * @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) {