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

Commit ee1f5abf authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Initialize settings only for default device during boot" into main

parents 7f24dac0 c9cd3637
Loading
Loading
Loading
Loading
+3 −4
Original line number Diff line number Diff line
@@ -420,11 +420,10 @@ public class SettingsProvider extends ContentProvider {
        SettingsState.cacheSystemPackageNamesAndSystemSignature(getContext());
        synchronized (mLock) {
            mSettingsRegistry.migrateAllLegacySettingsIfNeededLocked();
            final List<Integer> deviceIds = getDeviceIds();
            for (UserInfo user : mUserManager.getAliveUsers()) {
                for (int deviceId : deviceIds) {
                    mSettingsRegistry.ensureSettingsForUserAndDeviceLocked(user.id, deviceId);
                }
                // Only the default device would be available during boot.
                mSettingsRegistry.ensureSettingsForUserAndDeviceLocked(user.id,
                        Context.DEVICE_ID_DEFAULT);
            }
            mSettingsRegistry.syncSsaidTableOnStartLocked();
        }