summaryrefslogtreecommitdiffstats
path: root/core/java/android/app/Fragment.java
diff options
context:
space:
mode:
authorGeorge Mount <mount@google.com>2014-09-19 16:15:55 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-19 16:15:55 +0000
commit11b751add13b1f6ae1f88af06faa39eeb6395834 (patch)
tree391da50e232f2dd994a1fc0e869c6bf7a89b92a3 /core/java/android/app/Fragment.java
parent754b80c1c8190a7b721c26470b3595b3b34929b7 (diff)
parent30531c834552ebd1ab9aff8e6589a7b4b1b3b05d (diff)
downloadframeworks_base-11b751add13b1f6ae1f88af06faa39eeb6395834.zip
frameworks_base-11b751add13b1f6ae1f88af06faa39eeb6395834.tar.gz
frameworks_base-11b751add13b1f6ae1f88af06faa39eeb6395834.tar.bz2
am 5a988492: am 00877d68: am f187823e: Merge "Fix exception when fragment container has no View." into lmp-dev
* commit '5a98849276e295af41b6704683b3e59c421ae868': 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);
}