Attemp to fix a concurrent modify exception
Change-Id: I039091d43ba8c378066c26dcca416534d0f52d21
Fix: 36347434
Test: existing tests pass
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 2fa147e..73561a6 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -68,7 +68,6 @@
import com.android.settings.widget.SwitchBar;
import com.android.settingslib.drawer.DashboardCategory;
import com.android.settingslib.drawer.SettingsDrawerActivity;
-import com.android.settingslib.drawer.Tile;
import java.util.ArrayList;
import java.util.List;
@@ -879,8 +878,10 @@
final List<DashboardCategory> categories = mDashboardFeatureProvider.getAllCategories();
synchronized (categories) {
for (DashboardCategory category : categories) {
- for (Tile tile : category.tiles) {
- ComponentName component = tile.intent.getComponent();
+ final int tileCount = category.getTilesCount();
+ for (int i = 0; i < tileCount; i++) {
+ final ComponentName component = category.getTile(i).intent.getComponent();
+
final String name = component.getClassName();
final boolean isEnabledForRestricted = ArrayUtils.contains(
SettingsGateway.SETTINGS_FOR_RESTRICTED, name);