Merge "Add support to extend methods from VendorPhoneSwitcher" (2d82aeb2) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/vendor/VendorPhoneSwitcher.java

+17 −13

Original line number	Diff line number	Diff line
		@@ -78,14 +78,14 @@ public class VendorPhoneSwitcher extends PhoneSwitcher {
		private DdsSwitchState mDdsSwitchState = DdsSwitchState.NONE;
		private final int USER_INITIATED_SWITCH = 0;
		private final int NONUSER_INITIATED_SWITCH = 1;
		private final String PROPERTY_TEMP_DDSSWITCH = "persist.vendor.radio.enable_temp_dds";
		private final GsmCdmaCall[] mFgCsCalls;
		private final GsmCdmaCall[] mBgCsCalls;
		private final GsmCdmaCall[] mRiCsCalls;
		private final ImsPhone[] mImsPhones;
		private final ImsPhoneCall[] mFgImsCalls;
		private final ImsPhoneCall[] mBgImsCalls;
		private final ImsPhoneCall[] mRiImsCalls;
		protected final String PROPERTY_TEMP_DDSSWITCH = "persist.vendor.radio.enable_temp_dds";
		protected final GsmCdmaCall[] mFgCsCalls;
		protected final GsmCdmaCall[] mBgCsCalls;
		protected final GsmCdmaCall[] mRiCsCalls;
		protected final ImsPhone[] mImsPhones;
		protected final ImsPhoneCall[] mFgImsCalls;
		protected final ImsPhoneCall[] mBgImsCalls;
		protected final ImsPhoneCall[] mRiImsCalls;

		private final int EVENT_ALLOW_DATA_FALSE_RESPONSE = 201;
		private final int EVENT_ALLOW_DATA_TRUE_RESPONSE = 202;
		@@ -203,12 +203,16 @@ public class VendorPhoneSwitcher extends PhoneSwitcher {
		case EVENT_ALLOW_DATA_FALSE_RESPONSE: {
		log("EVENT_ALLOW_DATA_FALSE_RESPONSE");
		mWaitForDetachResponse = false;
		if (mNewActivePhones != null) {
		for (int phoneId : mNewActivePhones) {
		activate(phoneId);
		}
		if (mNewActivePhones.contains(ddsPhoneId)) {
		mManualDdsSwitch = false;
		}
		} else {
		log("mNewActivePhones is NULL");
		}
		break;
		}
		case EVENT_DDS_SWITCH_RESPONSE: {