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

Commit 01f76885 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android Git Automerger
Browse files

am 4465bbb7: Merge "Fix crash in Settings for secondary users" into jb-mr1-dev 

* commit '4465bbb7':
  Fix crash in Settings for secondary users
parents 55dba5ea 4465bbb7

src/com/android/settings/Settings.java

+2 −1
Original line number Diff line number Diff line
@@ -458,7 +458,8 @@ public class Settings extends PreferenceActivity 
                }

            }



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

            if (target.get(i) == header

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

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

                target.remove(i);

            }