Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f034f87d authored by Andrew Stadler's avatar Andrew Stadler Committed by Android (Google) Code Review
Browse files

Merge "Avoid NPE when reloading headers in single-pane mode"

parents e84c00f4 83681eb6

core/java/android/preference/PreferenceActivity.java

+3 −1
Original line number Diff line number Diff line
@@ -203,7 +203,9 @@ public abstract class PreferenceActivity extends ListActivity implements 
                    ArrayList<Header> oldHeaders = new ArrayList<Header>(mHeaders);

                    mHeaders.clear();

                    onBuildHeaders(mHeaders);

                    if (mAdapter != null) {

                        mAdapter.notifyDataSetChanged();

                    }

                    Header header = onGetNewHeader();

                    if (header != null && header.fragment != null) {

                        Header mappedHeader = findBestMatchingHeader(header, oldHeaders);