Remove use of Settings.Secure.USE_LOCATION_FOR_SERVICES

This Google-specific setting is going away because of unbundling.

This change will cause geotagging to be off by default, instead of
being set by SetupWizard by the "Use location for Google services"
prompt. If this is not desirable, another prompt could possibly be
added to SetupWizard, or a new framework geotagging setting
could be added and SetupWizard be modified to set that as part
of the Google location opt-in.

Part of: http://b/issue?id=2383870

Change-Id: Ic160c2260dd597a35d79fec93250a816fbee8b81

diff --git a/src/com/android/camera/RecordLocationPreference.java b/src/com/android/camera/RecordLocationPreference.java
index 552e739..95c1fbf 100644 (file)
--- a/src/com/android/camera/RecordLocationPreference.java
+++ b/src/com/android/camera/RecordLocationPreference.java
@@ -50,10 +50,6 @@ public class RecordLocationPreference extends ListPreference {
     public static boolean get(
             SharedPreferences pref, ContentResolver resolver) {
         String value = pref.getString(KEY, VALUE_NONE);
-        if (VALUE_NONE.equals(value)) {
-            return Settings.Secure.getInt(resolver,
-                    Settings.Secure.USE_LOCATION_FOR_SERVICES, 0) != 0;
-        }
         return VALUE_ON.equals(value);
     }
 }