diff options
| author | George Mount <mount@google.com> | 2014-09-19 15:39:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-19 15:39:45 +0000 |
| commit | 8f8f5f579fa6448a2ed370c5bd48af35a30f4944 (patch) | |
| tree | c97ec60a70d23d6df38df742870aad702b64adf8 /core/java/android/app/Activity.java | |
| parent | a1e7d53b0ad625202db3ed3c3c03ff3e2bdf4680 (diff) | |
| parent | 0b26e4d58ab1a60340dd7ab35ca6e3bddff9f760 (diff) | |
| download | frameworks_base-8f8f5f579fa6448a2ed370c5bd48af35a30f4944.zip frameworks_base-8f8f5f579fa6448a2ed370c5bd48af35a30f4944.tar.gz frameworks_base-8f8f5f579fa6448a2ed370c5bd48af35a30f4944.tar.bz2 | |
Merge "Fix exception when fragment container has no View." into lmp-dev
Diffstat (limited to 'core/java/android/app/Activity.java')
| -rw-r--r-- | core/java/android/app/Activity.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 5f3ed61..25c4897 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(). |