diff options
| author | Soonil Nagarkar <sooniln@google.com> | 2019-09-10 15:46:32 -0700 |
|---|---|---|
| committer | Soonil Nagarkar <sooniln@google.com> | 2019-09-10 15:48:01 -0700 |
| commit | 10b1960160734df8b09eae23de444d15075a9a4e (patch) | |
| tree | c360f41aee3327d0ea5596c35750fe976b13d728 /core/java/android | |
| parent | a34d0b7831509b89fc9c3b3a27ef4fd47eb94431 (diff) | |
LOCATION_PROVIDERS_ALLOWED fixes
Remove unnecessary lock from Settings and fix very old race condition
bug with LOCATION_PROVIDERS_ALLOWED, far too late for the fix to
actually help.
Test: presubmits
Bug: 139487787
Change-Id: I50a597291e589b3cb9bdd616808409a0421a0bfb
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/provider/Settings.java | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 7115da2bb531..51a40afb6bb4 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(); |