Merge "Revert "[Telephony] PhoneStateListener redesign"" (0a8639a2) · Commits · e / os / android_frameworks_opt_telephony

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -237,10 +237,10 @@ public class DefaultPhoneNotifier implements PhoneNotifier {
		}

		@Override
		public void notifyPhysicalChannelConfig(Phone sender,
		public void notifyPhysicalChannelConfiguration(Phone sender,
		List<PhysicalChannelConfig> configs) {
		int subId = sender.getSubId();
		mTelephonyRegistryMgr.notifyPhysicalChannelConfigForSubscriber(subId, configs);
		mTelephonyRegistryMgr.notifyPhysicalChannelConfigurationForSubscriber(subId, configs);
		}

		/**

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -2677,7 +2677,7 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		}

		/** Notify {@link PhysicalChannelConfig} changes. */
		public void notifyPhysicalChannelConfig(List<PhysicalChannelConfig> configs) {
		public void notifyPhysicalChannelConfiguration(List<PhysicalChannelConfig> configs) {
		mPhysicalChannelConfigRegistrants.notifyRegistrants(new AsyncResult(null, configs, null));
		}

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -118,7 +118,7 @@ public interface PhoneNotifier {
		/** Notify barring info has changed */
		void notifyBarringInfoChanged(Phone sender, @NonNull BarringInfo barringInfo);

		/** Notify PhysicalChannelConfig has changed. */
		void notifyPhysicalChannelConfig(Phone sender, List<PhysicalChannelConfig> configs);
		/** Notify of change to PhysicalChannelConfiguration. */
		void notifyPhysicalChannelConfiguration(Phone sender, List<PhysicalChannelConfig> configs);

		}

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -1661,7 +1661,7 @@ public class ServiceStateTracker extends Handler {
		log("EVENT_PHYSICAL_CHANNEL_CONFIG: size=" + list.size() + " list="
		+ list);
		}
		mPhone.notifyPhysicalChannelConfig(list);
		mPhone.notifyPhysicalChannelConfiguration(list);
		mLastPhysicalChannelConfigList = list;
		boolean hasChanged = false;
		if (updateNrStateFromPhysicalChannelConfigs(list, mSS)) {

tests/telephonytests/src/com/android/internal/telephony/PhoneStateListenerTest.java

+29 −0

Original line number	Diff line number	Diff line
		@@ -47,6 +47,8 @@ public class PhoneStateListenerTest extends TelephonyTest {
		private boolean mUserMobileDataState = false;
		private EmergencyNumber mCalledEmergencyNumber;
		private EmergencyNumber mTextedEmergencyNumber;
		private List<PhysicalChannelConfig> mPhysicalChannelConfigs;


		@Before
		public void setUp() throws Exception {
		@@ -75,6 +77,12 @@ public class PhoneStateListenerTest extends TelephonyTest {
		logd("OutgoingSmsEmergencyNumber Changed");
		mTextedEmergencyNumber = emergencyNumber;
		}

		@Override
		public void onPhysicalChannelConfigurationChanged(List<PhysicalChannelConfig> configs) {
		logd("PhysicalChannelConfig Changed");
		mPhysicalChannelConfigs = configs;
		}
		};
		processAllMessages();
		}
		@@ -158,4 +166,25 @@ public class PhoneStateListenerTest extends TelephonyTest {

		assertTrue(mTextedEmergencyNumber.equals(emergencyNumber));
		}

		@Test @SmallTest
		public void testTriggerPhysicalChannelConfigurationChanged() throws Exception {
		Field field = PhoneStateListener.class.getDeclaredField("callback");
		field.setAccessible(true);

		assertNull(mPhysicalChannelConfigs);

		PhysicalChannelConfig config = new PhysicalChannelConfig.Builder()
		.setCellConnectionStatus(PhysicalChannelConfig.CONNECTION_PRIMARY_SERVING)
		.setCellBandwidthDownlinkKhz(20000 /* bandwidth */)
		.build();

		List<PhysicalChannelConfig> configs = Collections.singletonList(config);

		((IPhoneStateListener) field.get(mPhoneStateListenerUT))
		.onPhysicalChannelConfigurationChanged(configs);
		processAllMessages();

		assertTrue(mPhysicalChannelConfigs.equals(configs));
		}
		}