Merge "Fix crash in Settings for secondary users" into jb-mr1-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
4465bbb7e1
@@ -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)) {
|
&& !ArrayUtils.contains(SETTINGS_FOR_RESTRICTED, id)) {
|
||||||
target.remove(i);
|
target.remove(i);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user