Merge "Fix bug in passing argument to switch dsds" (a9f04bf9) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/PhoneConfigurationManager.java

+5 −3

Original line number	Original line	Diff line number	Diff line
	@@ -17,6 +17,7 @@
	package com.android.internal.telephony;		package com.android.internal.telephony;

	import android.content.Context;		import android.content.Context;
			import android.os.AsyncResult;
	import android.os.Handler;		import android.os.Handler;
	import android.os.Message;		import android.os.Message;
	import android.os.PowerManager;		import android.os.PowerManager;
	@@ -97,11 +98,12 @@ public class PhoneConfigurationManager {
	public void handleMessage(Message msg) {		public void handleMessage(Message msg) {
	switch (msg.what) {		switch (msg.what) {
	case EVENT_SWITCH_DSDS_CONFIG_DONE:		case EVENT_SWITCH_DSDS_CONFIG_DONE:
	if (msg.obj != null) {		AsyncResult ar = (AsyncResult) msg.obj;
			if (ar != null && ar.exception == null) {
	int numOfLiveModems = msg.arg1;		int numOfLiveModems = msg.arg1;
	setMultiSimProperties(numOfLiveModems);		setMultiSimProperties(numOfLiveModems);
	} else {		} else {
	log(msg.what + " failure. Not switching multi-sim config.");		log(msg.what + " failure. Not switching multi-sim config." + ar.exception);
	}		}
	break;		break;
	}		}
	@@ -167,7 +169,7 @@ public class PhoneConfigurationManager {
	}		}
	if (getNumOfActiveSims() != numOfSims) {		if (getNumOfActiveSims() != numOfSims) {
	Message callback = Message.obtain(		Message callback = Message.obtain(
	mHandler, EVENT_SWITCH_DSDS_CONFIG_DONE, numOfSims);		mHandler, EVENT_SWITCH_DSDS_CONFIG_DONE, numOfSims, 0 /*dummy arg/);
	mRadioConfig.setModemsConfig(numOfSims, callback);		mRadioConfig.setModemsConfig(numOfSims, callback);
	} else {		} else {
	log("switchMultiSimConfig: No need to switch. getNumOfActiveSims is already "		log("switchMultiSimConfig: No need to switch. getNumOfActiveSims is already "