summaryrefslogtreecommitdiffstats
path: root/core/java/android/app/Activity.java
diff options
context:
space:
mode:
authorGeorge Mount <mount@google.com>2014-09-17 16:36:42 -0700
committerGeorge Mount <mount@google.com>2014-09-18 15:24:48 -0700
commit0b26e4d58ab1a60340dd7ab35ca6e3bddff9f760 (patch)
tree06c65e80b1335b074d997696e28261adc211c555 /core/java/android/app/Activity.java
parent5083943ff85c7452b166e6c2b044e3d9dae9d017 (diff)
downloadframeworks_base-0b26e4d58ab1a60340dd7ab35ca6e3bddff9f760.zip
frameworks_base-0b26e4d58ab1a60340dd7ab35ca6e3bddff9f760.tar.gz
frameworks_base-0b26e4d58ab1a60340dd7ab35ca6e3bddff9f760.tar.bz2
Fix exception when fragment container has no View.
Bug 17535259 Change-Id: I29c9ef53dd693cbb4043ebfb4750753870c9e99a
Diffstat (limited to 'core/java/android/app/Activity.java')
-rw-r--r--core/java/android/app/Activity.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index 701ab1d..9e53a35 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -745,6 +745,11 @@ public class Activity extends ContextThemeWrapper
public View findViewById(int id) {
return Activity.this.findViewById(id);
}
+ @Override
+ public boolean hasView() {
+ Window window = Activity.this.getWindow();
+ return (window != null && window.peekDecorView() != null);
+ }
};
// Most recent call to requestVisibleBehind().