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

am 1ef6a106: Merge "Fix Settings app crash after enabled multi-user"

Browse Source 
* commit '1ef6a106d50f6fce2e2a810075a55bb264fa5c23':
  Fix Settings app crash after enabled multi-user
This commit is contained in:
Amith Yamasani
2013-02-15 10:17:17 -08:00
committed by Android Git Automerger
parent 595a891922 1ef6a106d5
commit 07d195ed28
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

@@ -450,14 +450,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) {