Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1366046e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Attemp to fix a concurrent modify exception"

parents 77762437 7c8f8a0a

src/com/android/settings/SettingsActivity.java

+4 −3
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ import com.android.settings.wfd.WifiDisplaySettings; 
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 @@ public class SettingsActivity extends SettingsDrawerActivity 
            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);