Merge "Fix setCdmaBroadcastConfig in RIL.java to include all categories." into oc-dev (fde4aeeb) · Commits · e / devices / smdk4412 / android_frameworks_opt_telephony

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

+17 −16

Original line number	Diff line number	Diff line
		@@ -2614,26 +2614,27 @@ public final class RIL extends BaseCommands implements CommandsInterface {
		RILRequest rr = obtainRequest(RIL_REQUEST_CDMA_SET_BROADCAST_CONFIG, result,
		mRILDefaultWorkSource);

		if (RILJ_LOGD) {
		riljLog(rr.serialString() + "> " + requestToString(rr.mRequest)
		+ " with " + configs.length + " configs : ");
		for (int i = 0; i < configs.length; i++) {
		riljLog(configs[i].toString());
		}
		}

		ArrayList<CdmaBroadcastSmsConfigInfo> halConfigs = new ArrayList<>();

		int numOfConfig = configs.length;
		CdmaBroadcastSmsConfigInfo info;

		for (int i = 0; i < numOfConfig; i++) {
		info = new CdmaBroadcastSmsConfigInfo();
		info.serviceCategory = configs[i].getFromServiceCategory();
		info.language = configs[i].getLanguage();
		info.selected = configs[i].isSelected();
		for (CdmaSmsBroadcastConfigInfo config: configs) {
		for (int i = config.getFromServiceCategory();
		i <= config.getToServiceCategory();
		i++) {
		CdmaBroadcastSmsConfigInfo info = new CdmaBroadcastSmsConfigInfo();
		info.serviceCategory = i;
		info.language = config.getLanguage();
		info.selected = config.isSelected();
		halConfigs.add(info);
		}
		}

		if (RILJ_LOGD) {
		riljLog(rr.serialString() + "> " + requestToString(rr.mRequest)
		+ " with " + halConfigs.size() + " configs : ");
		for (CdmaBroadcastSmsConfigInfo config : halConfigs) {
		riljLog(config.toString());
		}
		}

		try {
		radioProxy.setCdmaBroadcastConfig(rr.mSerial, halConfigs);

+6 −0

Original line number	Diff line number	Diff line
		@@ -132,6 +132,8 @@ public class GsmCdmaCallTrackerTest extends TelephonyTest {
		assertEquals(GsmCdmaCall.State.IDLE, mCTUT.mBackgroundCall.getState());
		}

		@FlakyTest
		@Ignore
		@Test
		@MediumTest
		public void testMOCallHangup() {
		@@ -154,6 +156,8 @@ public class GsmCdmaCallTrackerTest extends TelephonyTest {
		assertEquals(PhoneConstants.State.IDLE, mCTUT.getState());
		}

		@FlakyTest
		@Ignore
		@Test
		@MediumTest
		public void testMOCallDialPickUpHangup() {
		@@ -353,6 +357,8 @@ public class GsmCdmaCallTrackerTest extends TelephonyTest {

		}

		@FlakyTest
		@Ignore
		@Test @SmallTest
		public void testVoiceCallEndedListener(){
		logd("register for voice call ended event");