Merge "Fix crash on settings launch in secondary user."
This commit is contained in:
committed by
Android (Google) Code Review
commit
37fe059e79
@@ -1077,7 +1077,8 @@ public class SettingsActivity extends Activity
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (UserHandle.MU_ENABLED && UserHandle.myUserId() != 0
|
if (UserHandle.MU_ENABLED && UserHandle.myUserId() != 0
|
||||||
&& !ArrayUtils.contains(SETTINGS_FOR_RESTRICTED, id)) {
|
&& !ArrayUtils.contains(SETTINGS_FOR_RESTRICTED, id)
|
||||||
|
&& n < category.getTilesCount()) {
|
||||||
category.removeTile(n);
|
category.removeTile(n);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user