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

Commit 1ef6a106 authored by Amith Yamasani's avatar Amith Yamasani Committed by Gerrit Code Review
Browse files

Merge "Fix Settings app crash after enabled multi-user"

parents bbe409d3 bb0e621f

src/com/android/settings/Settings.java

+2 −2
Original line number Diff line number Diff line
@@ -464,14 +464,14 @@ public class Settings extends PreferenceActivity 
                }

            }



            if (target.get(i) == header

            if (i < target.size() && target.get(i) == header

                    && UserHandle.MU_ENABLED && UserHandle.myUserId() != 0

                    && !ArrayUtils.contains(SETTINGS_FOR_RESTRICTED, id)) {

                target.remove(i);

            }



            // Increment if the current one wasn't removed by the Utils code.

            if (target.get(i) == header) {

            if (i < target.size() && target.get(i) == header) {

                // Hold on to the first header, when we need to reset to the top-level

                if (mFirstHeader == null &&

                        HeaderAdapter.getHeaderType(header) != HeaderAdapter.HEADER_TYPE_CATEGORY) {