Merge "Fetch WifiManager instance at the time of use" into jb-dev

Author: isheriff

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;
     }