commit 93259c14f3aca4739e2cf7691cb0416ded509d8d
author Tom O'Neill <tomo@google.com> Mon Aug 26 14:40:54 2013 -0700
committer Tom O'Neill <tomo@google.com> Mon Aug 26 14:40:54 2013 -0700
tree 83cf7eab2f74bb3c1ffe5ce1dc0929f205a79e77
parent cbf589e73cd8b9a62c413c804b698e489f44c403

Switch to new location mode API recommended by API council

- Part of b/10461763 fix

Change-Id: I202ce4c817f24a1682796e92fed9cc3efcc31a81

src/com/android/settings/location/LocationSettingsBase.java

diff --git a/src/com/android/settings/location/LocationSettingsBase.java b/src/com/android/settings/location/LocationSettingsBase.java
index 415e343..5637b25 100644
--- a/src/com/android/settings/location/LocationSettingsBase.java
+++ b/src/com/android/settings/location/LocationSettingsBase.java
@@ -17,7 +17,6 @@
 package com.android.settings.location;
 
 import android.content.ContentQueryMap;
-import android.content.ContentResolver;
 import android.content.Context;
 import android.database.Cursor;
 import android.os.UserManager;
@@ -79,13 +78,13 @@
         if (um.hasUserRestriction(UserManager.DISALLOW_SHARE_LOCATION)) {
             return;
         }
-        Settings.Secure.setLocationMode(getContentResolver(), mode);
+        Settings.Secure.putInt(getContentResolver(), Settings.Secure.LOCATION_MODE, mode);
         refreshLocationMode();
     }
 
     public void refreshLocationMode() {
-        ContentResolver res = getContentResolver();
-        int mode = Settings.Secure.getLocationMode(getContentResolver());
+        int mode = Settings.Secure.getInt(getContentResolver(), Settings.Secure.LOCATION_MODE,
+                Settings.Secure.LOCATION_MODE_OFF);
         onModeChanged(mode);
     }
 }

src/com/android/settings/widget/SettingsAppWidgetProvider.java

diff --git a/src/com/android/settings/widget/SettingsAppWidgetProvider.java b/src/com/android/settings/widget/SettingsAppWidgetProvider.java
index 71994a9..da085f7 100644
--- a/src/com/android/settings/widget/SettingsAppWidgetProvider.java
+++ b/src/com/android/settings/widget/SettingsAppWidgetProvider.java
@@ -521,7 +521,8 @@
         @Override
         public int getActualState(Context context) {
             ContentResolver resolver = context.getContentResolver();
-            int currentLocationMode = Settings.Secure.getLocationMode(resolver);
+            int currentLocationMode = Settings.Secure.getInt(resolver,
+                    Settings.Secure.LOCATION_MODE, Settings.Secure.LOCATION_MODE_OFF);
             switch (currentLocationMode) {
                 case Settings.Secure.LOCATION_MODE_BATTERY_SAVING:
                 case Settings.Secure.LOCATION_MODE_OFF:
@@ -550,7 +551,7 @@
                         int mode = desiredState
                                 ? Settings.Secure.LOCATION_MODE_HIGH_ACCURACY
                                 : Settings.Secure.LOCATION_MODE_BATTERY_SAVING;
-                        Settings.Secure.setLocationMode(resolver, mode);
+                        Settings.Secure.putInt(resolver, Settings.Secure.LOCATION_MODE, mode);
                         return desiredState;
                     }