commit ffd252131ef647b63de8392d0143d9595063f5da
author Nathan Harold <nharold@google.com> Mon Jun 20 18:57:07 2016 -0700
committer Nathan Harold <nharold@google.com> Thu Aug 04 16:00:32 2016 -0700
tree 520a7a43e9dd4f8c1ca224991b83790adbfe300d
parent d314799bfa330680be939894d208ab36d7c15ce0

Move Airplane Mode Query to Call Global Settings

Bug: 29516025
Change-Id: Ib2c30cba1a19bc32b0ab719ed776f9907768a654

Common/src/com/googlecode/android_scripting/facade/ConnectivityManagerFacade.java

diff --git a/Common/src/com/googlecode/android_scripting/facade/ConnectivityManagerFacade.java b/Common/src/com/googlecode/android_scripting/facade/ConnectivityManagerFacade.java
index 73dbace..512dae0 100644
--- a/Common/src/com/googlecode/android_scripting/facade/ConnectivityManagerFacade.java
+++ b/Common/src/com/googlecode/android_scripting/facade/ConnectivityManagerFacade.java
@@ -30,7 +30,7 @@
 import android.net.NetworkInfo;
 import android.net.NetworkRequest;
 import android.os.Bundle;
-import android.provider.Settings.SettingNotFoundException;
+import android.provider.Settings;
 
 import com.googlecode.android_scripting.Log;
 import com.googlecode.android_scripting.jsonrpc.RpcReceiver;
@@ -686,9 +686,10 @@
             returns = "True if airplane mode is enabled.")
     public Boolean connectivityCheckAirplaneMode() {
         try {
-            return android.provider.Settings.System.getInt(mService.getContentResolver(),
-                    android.provider.Settings.Global.AIRPLANE_MODE_ON) == AIRPLANE_MODE_ON;
-        } catch (SettingNotFoundException e) {
+            return Settings.Global.getInt(mService.getContentResolver(),
+                    Settings.Global.AIRPLANE_MODE_ON) == AIRPLANE_MODE_ON;
+        } catch (Settings.SettingNotFoundException e) {
+            Log.e("Settings.Global.AIRPLANE_MODE_ON not found!");
             return false;
         }
     }