Merge "Updatting DATA_ROAMING access from Settings to TelephonyManager API" into tm-dev

1 files changed, 4 insertions, 7 deletions

diff --git a/Common/src/com/googlecode/android_scripting/facade/ConnectivityManagerFacade.java b/Common/src/com/googlecode/android_scripting/facade/ConnectivityManagerFacade.java
index 26f00128..f9fffb16 100644
--- a/Common/src/com/googlecode/android_scripting/facade/ConnectivityManagerFacade.java
+++ b/Common/src/com/googlecode/android_scripting/facade/ConnectivityManagerFacade.java
@@ -42,6 +42,7 @@ import android.net.wifi.WifiNetworkSpecifier;
 import android.os.Bundle;
 import android.os.RemoteException;
 import android.provider.Settings;
+import android.telephony.TelephonyManager;
 
 import com.android.modules.utils.build.SdkLevel;
 
@@ -403,6 +404,7 @@ public class ConnectivityManagerFacade extends RpcReceiver {
     private final ConnectivityReceiver mConnectivityReceiver;
     private final EventFacade mEventFacade;
     private NetworkCallback mNetworkCallback;
+    private TelephonyManager mTelephonyManager;
     private static HashMap<String, NetworkCallback> mNetworkCallbackMap =
             new HashMap<String, NetworkCallback>();
     private boolean mTrackingConnectivityStateChange;
@@ -418,6 +420,7 @@ public class ConnectivityManagerFacade extends RpcReceiver {
         mEventFacade = manager.getReceiver(EventFacade.class);
         mConnectivityReceiver = new ConnectivityReceiver();
         mTrackingConnectivityStateChange = false;
+        mTelephonyManager = (TelephonyManager) mService.getSystemService(Context.TELEPHONY_SERVICE);
     }
 
     @Rpc(description = "Listen for connectivity changes")
@@ -717,13 +720,7 @@ public class ConnectivityManagerFacade extends RpcReceiver {
     @Rpc(description = "Checks data roaming mode setting.",
             returns = "True if data roaming mode is enabled.")
     public Boolean connectivityCheckDataRoamingMode() {
-        try {
-            return Settings.Global.getInt(mService.getContentResolver(),
-                    Settings.Global.DATA_ROAMING) == DATA_ROAMING_ON;
-        } catch (Settings.SettingNotFoundException e) {
-            Log.e("Settings.Global.DATA_ROAMING not found!");
-            return false;
-        }
+        return mTelephonyManager.isDataRoamingEnabled();
     }
 
     /**