Fetch WifiManager instance at the time of use

isheriff · isheriff · commit 4f4f5166c937 · 2012-04-27T14:42:42.000-07:00
Bug: 5340393
Change-Id: Idb0a6dbe969bc3c7955134df43b86f28208c73c3
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java
@@ -681,10 +681,15 @@ private int readInt(byte[] in, int pos) {
     }
 
     private int enableWifi(boolean enable) {
+        if (mWfm == null) {
+            mWfm = (WifiManager) getSystemService(Context.WIFI_SERVICE);
+        }
         if (mWfm != null) {
             int state = mWfm.getWifiState();
             mWfm.setWifiEnabled(enable);
             return state;
+        } else {
+            Log.e(TAG, "Failed to fetch WifiManager instance");
         }
         return WifiManager.WIFI_STATE_UNKNOWN;
     }

Original file line number	Diff line number	Diff line change
`@@ -681,10 +681,15 @@ private int readInt(byte[] in, int pos) {`
`681`	`681`	`}`
`682`	`682`
`683`	`683`	`private int enableWifi(boolean enable) {`
	`684`	`+ if (mWfm == null) {`
	`685`	`+ mWfm = (WifiManager) getSystemService(Context.WIFI_SERVICE);`
	`686`	`+ }`
`684`	`687`	`if (mWfm != null) {`
`685`	`688`	`int state = mWfm.getWifiState();`
`686`	`689`	`mWfm.setWifiEnabled(enable);`
`687`	`690`	`return state;`
	`691`	`+ } else {`
	`692`	`+ Log.e(TAG, "Failed to fetch WifiManager instance");`
`688`	`693`	`}`
`689`	`694`	`return WifiManager.WIFI_STATE_UNKNOWN;`
`690`	`695`	`}`