Merge "Fix NPE in PanelFragment" am: 06cafcd733 am: 98e3ed4e5d am: 6ad23a342d... (e7767359) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/panel/PanelFragment.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -156,8 +156,13 @@ public class PanelFragment extends Fragment {

		private void createPanelContent() {
		final FragmentActivity activity = getActivity();
		if (activity == null) {
		return;
		}

		if (mLayoutView == null) {
		activity.finish();
		return;
		}

		mPanelSlices = mLayoutView.findViewById(R.id.panel_parent_layout);
		@@ -183,6 +188,7 @@ public class PanelFragment extends Fragment {

		if (mPanel == null) {
		activity.finish();
		return;
		}

		mPanel.registerCallback(new LocalPanelCallback());