summaryrefslogtreecommitdiffstats
path: root/core/java/android/app/Fragment.java
diff options
context:
space:
mode:
authorGeorge Mount <mount@google.com>2014-09-19 15:54:11 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-19 15:54:11 +0000
commitedbffaadf9173984208263d2f57904fb95a3b2bc (patch)
tree53f08550da133c47d101fc834cd46e7c19b9a464 /core/java/android/app/Fragment.java
parent5abffd26b39ebde68d9d63d48748f68155abbdd3 (diff)
parent8f8f5f579fa6448a2ed370c5bd48af35a30f4944 (diff)
downloadframeworks_base-edbffaadf9173984208263d2f57904fb95a3b2bc.zip
frameworks_base-edbffaadf9173984208263d2f57904fb95a3b2bc.tar.gz
frameworks_base-edbffaadf9173984208263d2f57904fb95a3b2bc.tar.bz2
am f187823e: Merge "Fix exception when fragment container has no View." into lmp-dev
* commit 'f187823e02c34118ed6de23f844a043d3a64829c': Fix exception when fragment container has no View.
Diffstat (limited to 'core/java/android/app/Fragment.java')
-rw-r--r--core/java/android/app/Fragment.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/app/Fragment.java b/core/java/android/app/Fragment.java
index a95abab..5196834 100644
--- a/core/java/android/app/Fragment.java
+++ b/core/java/android/app/Fragment.java
@@ -2015,6 +2015,11 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene
}
return mView.findViewById(id);
}
+
+ @Override
+ public boolean hasView() {
+ return (mView != null);
+ }
}, this);
}