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

Fix Settings app crash after enabled multi-user

Browse Source 
Bug: 8128225
Change-Id: I2918a5ec36e861a1ce4b2e67cf7607929732a7bf
This commit is contained in:
Jaewan Kim
2013-02-04 15:36:17 +09:00
parent 79bf08d246
commit bb0e621f18
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/Settings.java
View File

@@ -460,14 +460,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 && UserHandle.MU_ENABLED && UserHandle.myUserId() != 0
&& !ArrayUtils.contains(SETTINGS_FOR_RESTRICTED, id)) { && !ArrayUtils.contains(SETTINGS_FOR_RESTRICTED, id)) {
target.remove(i); target.remove(i);
} }
// Increment if the current one wasn't removed by the Utils code. // 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 // Hold on to the first header, when we need to reset to the top-level
if (mFirstHeader == null && if (mFirstHeader == null &&
HeaderAdapter.getHeaderType(header) != HeaderAdapter.HEADER_TYPE_CATEGORY) { HeaderAdapter.getHeaderType(header) != HeaderAdapter.HEADER_TYPE_CATEGORY) {