Merge "Fetch WifiManager instance at the time of use" into jb-dev (80f84a15) · Commits · e / os / android_frameworks_base

packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -681,10 +681,15 @@ public class SettingsBackupAgent extends BackupAgentHelper {
		}

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