Merge "Fix an NPE in WifiSettings." into jb-mr1-dev (b0873900) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/wifi/WifiSettings.java

+33 −15

Original line number	Diff line number	Diff line
		@@ -245,30 +245,39 @@ public class WifiSettings extends SettingsPreferenceFragment
		public void onSuccess() {
		}
		public void onFailure(int reason) {
		Toast.makeText(getActivity(),
		Activity activity = getActivity();
		if (activity != null) {
		Toast.makeText(activity,
		R.string.wifi_failed_connect_message,
		Toast.LENGTH_SHORT).show();
		}
		}
		};

		mSaveListener = new WifiManager.ActionListener() {
		public void onSuccess() {
		}
		public void onFailure(int reason) {
		Toast.makeText(getActivity(),
		Activity activity = getActivity();
		if (activity != null) {
		Toast.makeText(activity,
		R.string.wifi_failed_save_message,
		Toast.LENGTH_SHORT).show();
		}
		}
		};

		mForgetListener = new WifiManager.ActionListener() {
		public void onSuccess() {
		}
		public void onFailure(int reason) {
		Toast.makeText(getActivity(),
		Activity activity = getActivity();
		if (activity != null) {
		Toast.makeText(activity,
		R.string.wifi_failed_forget_message,
		Toast.LENGTH_SHORT).show();
		}
		}
		};

		if (savedInstanceState != null
		@@ -290,7 +299,7 @@ public class WifiSettings extends SettingsPreferenceFragment
		}

		final ConnectivityManager connectivity = (ConnectivityManager)
		getActivity().getSystemService(Context.CONNECTIVITY_SERVICE);
		activity.getSystemService(Context.CONNECTIVITY_SERVICE);
		if (connectivity != null
		&& connectivity.getNetworkInfo(ConnectivityManager.TYPE_WIFI).isConnected()) {
		activity.finish();
		@@ -305,7 +314,7 @@ public class WifiSettings extends SettingsPreferenceFragment
		if (mEnableNextOnConnection) {
		if (hasNextButton()) {
		final ConnectivityManager connectivity = (ConnectivityManager)
		getActivity().getSystemService(Context.CONNECTIVITY_SERVICE);
		activity.getSystemService(Context.CONNECTIVITY_SERVICE);
		if (connectivity != null) {
		NetworkInfo info = connectivity.getNetworkInfo(
		ConnectivityManager.TYPE_WIFI);
		@@ -737,7 +746,10 @@ public class WifiSettings extends SettingsPreferenceFragment
		updateAccessPoints();
		updateConnectionState(info.getDetailedState());
		if (mAutoFinishOnConnection && info.isConnected()) {
		getActivity().finish();
		Activity activity = getActivity();
		if (activity != null) {
		activity.finish();
		}
		return;
		}
		} else if (WifiManager.RSSI_CHANGED_ACTION.equals(action)) {
		@@ -774,7 +786,10 @@ public class WifiSettings extends SettingsPreferenceFragment
		}

		private void updateWifiState(int state) {
		getActivity().invalidateOptionsMenu();
		Activity activity = getActivity();
		if (activity != null) {
		activity.invalidateOptionsMenu();
		}

		switch (state) {
		case WifiManager.WIFI_STATE_ENABLED:
		@@ -820,8 +835,11 @@ public class WifiSettings extends SettingsPreferenceFragment
		mRetry = 0;
		} else if (++mRetry >= 3) {
		mRetry = 0;
		Toast.makeText(getActivity(), R.string.wifi_fail_to_scan,
		Activity activity = getActivity();
		if (activity != null) {
		Toast.makeText(activity, R.string.wifi_fail_to_scan,
		Toast.LENGTH_LONG).show();
		}
		return;
		}
		sendEmptyMessageDelayed(0, WIFI_RESCAN_INTERVAL_MS);