commit | 9f9d04fff58b9dd16af85bd49f1c0da95c2d0b80 | [log] [tgz] |
---|---|---|
author | Dake Gu <dake@google.com> | Mon Apr 11 18:42:25 2016 -0700 |
committer | Dake Gu <dake@google.com> | Mon Apr 11 18:47:13 2016 -0700 |
tree | 9bec138ca7eb947abcf070e0c8a51828a2f5ff13 | |
parent | 7b2fc891a7f28b23d53b563a8c16b7441cafc347 [diff] |
Fix NPE in notifyViewCreated() Change-Id: I9ad6f3dc641fc37f86aa0bbd388968ecb309e51f
diff --git a/samples/SupportLeanbackDemos/src/com/example/android/leanback/BrowseFragment.java b/samples/SupportLeanbackDemos/src/com/example/android/leanback/BrowseFragment.java index afd4038..737d2f0 100644 --- a/samples/SupportLeanbackDemos/src/com/example/android/leanback/BrowseFragment.java +++ b/samples/SupportLeanbackDemos/src/com/example/android/leanback/BrowseFragment.java
@@ -327,13 +327,10 @@ } @Override - public void onStart() { - super.onStart(); - mMainFragmentAdapter.getFragmentHost().notifyViewCreated(mMainFragmentAdapter); - } - - @Override public void onViewCreated(View view, Bundle savedInstanceState) { + if (mMainFragmentAdapter.getFragmentHost() != null) { + mMainFragmentAdapter.getFragmentHost().notifyViewCreated(mMainFragmentAdapter); + } setEntranceTransitionState(mEntranceTransitionState); }
diff --git a/samples/SupportLeanbackDemos/src/com/example/android/leanback/BrowseSupportFragment.java b/samples/SupportLeanbackDemos/src/com/example/android/leanback/BrowseSupportFragment.java index 02da218..1291a7f 100644 --- a/samples/SupportLeanbackDemos/src/com/example/android/leanback/BrowseSupportFragment.java +++ b/samples/SupportLeanbackDemos/src/com/example/android/leanback/BrowseSupportFragment.java
@@ -330,6 +330,9 @@ @Override public void onViewCreated(View view, Bundle savedInstanceState) { + if (mMainFragmentAdapter.getFragmentHost() != null) { + mMainFragmentAdapter.getFragmentHost().notifyViewCreated(mMainFragmentAdapter); + } setEntranceTransitionState(mEntranceTransitionState); }
diff --git a/samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackOverlaySupportActivity.java b/samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackOverlaySupportActivity.java index f965b37..e1b01e1 100644 --- a/samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackOverlaySupportActivity.java +++ b/samples/SupportLeanbackDemos/src/com/example/android/leanback/PlaybackOverlaySupportActivity.java
@@ -48,6 +48,6 @@ } public interface PictureInPictureListener { - void onPictureInPictureModeChanged(boolean isInPictureInPicture); + void onPictureInPictureModeChanged(boolean isInPictureInPictureMode); } }