diff options
| -rw-r--r-- | core/java/android/provider/Settings.java | 4 | ||||
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java | 12 |
2 files changed, 6 insertions, 10 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index d0f13587716c..8b20f0bec7be 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -2103,10 +2103,6 @@ public final class Settings { private static final String TAG = "Settings"; private static final boolean LOCAL_LOGV = false; - // Lock ensures that when enabling/disabling the master location switch, we don't end up - // with a partial enable/disable state in multi-threaded situations. - private static final Object mLocationSettingsLock = new Object(); - // Used in system server calling uid workaround in call() private static boolean sInSystemServer = false; private static final Object sInSystemServerLock = new Object(); diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index 32fc7ff978cd..720266a72423 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -1521,14 +1521,14 @@ public class SettingsProvider extends ContentProvider { return false; } - // Special cases for location providers (sigh). - if (Settings.Secure.LOCATION_PROVIDERS_ALLOWED.equals(name)) { - return updateLocationProvidersAllowedLocked(value, tag, owningUserId, makeDefault, - forceNotify); - } - // Mutate the value. synchronized (mLock) { + // Special cases for location providers (sigh). + if (Settings.Secure.LOCATION_PROVIDERS_ALLOWED.equals(name)) { + return updateLocationProvidersAllowedLocked(value, tag, owningUserId, makeDefault, + forceNotify); + } + switch (operation) { case MUTATION_OPERATION_INSERT: { return mSettingsRegistry.insertSettingLocked(SETTINGS_TYPE_SECURE, |