diff options
| author | Dianne Hackborn <hackbod@google.com> | 2014-10-08 22:48:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-08 22:48:44 +0000 |
| commit | 529b78941c20c2b45312eeedbd509d0ded4f7323 (patch) | |
| tree | 1aff9a9aac271e48dec04cb986c5cadc5f4105e9 /core/java/android/app/Fragment.java | |
| parent | 511925c9e143ebc6eeb0efdf433cc0519b5e5eb1 (diff) | |
| parent | 89b196958fee07475765bd3c458098464ba16f2e (diff) | |
| download | frameworks_base-529b78941c20c2b45312eeedbd509d0ded4f7323.zip frameworks_base-529b78941c20c2b45312eeedbd509d0ded4f7323.tar.gz frameworks_base-529b78941c20c2b45312eeedbd509d0ded4f7323.tar.bz2 | |
am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev
* commit '89b196958fee07475765bd3c458098464ba16f2e':
Put in real "code" (aka marketing) name.
Diffstat (limited to 'core/java/android/app/Fragment.java')
| -rw-r--r-- | core/java/android/app/Fragment.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/Fragment.java b/core/java/android/app/Fragment.java index c49012b..ab28d95 100644 --- a/core/java/android/app/Fragment.java +++ b/core/java/android/app/Fragment.java @@ -1124,7 +1124,7 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene */ public LayoutInflater getLayoutInflater(Bundle savedInstanceState) { // Newer platform versions use the child fragment manager's LayoutInflaterFactory. - if (mActivity.getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.L) { + if (mActivity.getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.LOLLIPOP) { LayoutInflater result = mActivity.getLayoutInflater().cloneInContext(mActivity); getChildFragmentManager(); // Init if needed; use raw implementation below. result.setPrivateFactory(mChildFragmentManager.getLayoutInflaterFactory()); |