Merge "Fix WifiHandler for MSim" into cm-11.0 (5fb78c88) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/policy/MSimNetworkController.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -195,6 +195,11 @@ public class MSimNetworkController extends NetworkController {
		mLastSimIconId = mMSimLastSimIconId[mDefaultSubscription];
		}

		@Override
		protected Handler createWifiHandler() {
		return new MSimWifiHandler();
		}

		@Override
		protected void registerPhoneStateListener(Context context) {
		// telephony

+6 −2

Original line number	Diff line number	Diff line
		@@ -237,7 +237,7 @@ public class NetworkController extends BroadcastReceiver implements DemoMode {

		// wifi
		mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
		Handler handler = new WifiHandler();
		Handler handler = createWifiHandler();
		mWifiChannel = new AsyncChannel();
		Messenger wifiMessenger = mWifiManager.getWifiServiceMessenger();
		if (wifiMessenger != null) {
		@@ -282,6 +282,10 @@ public class NetworkController extends BroadcastReceiver implements DemoMode {
		return (mServiceState != null && mServiceState.isEmergencyOnly());
		}

		protected Handler createWifiHandler() {
		return new WifiHandler();
		}

		public void addPhoneSignalIconView(ImageView v) {
		mPhoneSignalIconViews.add(v);
		}