PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix NPE in PanelFragment" am: 06cafcd733 am: 98e3ed4e5d am: 6ad23a342d am: 9b798aa738 am: 2b481a5969

Browse Source 
Change-Id: Ic082a4f9aa65114eec606edb77c3c7bb8e2be8e8
This commit is contained in:
Automerger Merge Worker
2020-03-02 12:35:57 +00:00
parent b4909b5f21 2b481a5969
commit e77673594d
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/panel/PanelFragment.java
View File

@@ -156,8 +156,13 @@ public class PanelFragment extends Fragment {
private void createPanelContent() { private void createPanelContent() {
final FragmentActivity activity = getActivity(); final FragmentActivity activity = getActivity();
if (activity == null) {
return;
}
if (mLayoutView == null) { if (mLayoutView == null) {
activity.finish(); activity.finish();
return;
} }
mPanelSlices = mLayoutView.findViewById(R.id.panel_parent_layout); mPanelSlices = mLayoutView.findViewById(R.id.panel_parent_layout);
@@ -183,6 +188,7 @@ public class PanelFragment extends Fragment {
if (mPanel == null) { if (mPanel == null) {
activity.finish(); activity.finish();
return;
} }
mPanel.registerCallback(new LocalPanelCallback()); mPanel.registerCallback(new LocalPanelCallback());