Merge "Notify physical channel configuration with phoneId and subId" into qt-r1-dev (b24d5d77) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/TelephonyRegistry.java

+6 −8

Original line number	Diff line number	Diff line
		@@ -1255,23 +1255,21 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
		}
		}

		public void notifyPhysicalChannelConfiguration(List<PhysicalChannelConfig> configs) {
		notifyPhysicalChannelConfigurationForSubscriber(SubscriptionManager.DEFAULT_SUBSCRIPTION_ID,
		configs);
		}

		public void notifyPhysicalChannelConfigurationForSubscriber(int subId,
		/**
		* Notify physical channel configuration according to subscripton ID and phone ID
		*/
		public void notifyPhysicalChannelConfigurationForSubscriber(int phoneId, int subId,
		List<PhysicalChannelConfig> configs) {
		if (!checkNotifyPermission("notifyPhysicalChannelConfiguration()")) {
		return;
		}

		if (VDBG) {
		log("notifyPhysicalChannelConfiguration: subId=" + subId + " configs=" + configs);
		log("notifyPhysicalChannelConfiguration: subId=" + subId + " phoneId=" + phoneId
		+ " configs=" + configs);
		}

		synchronized (mRecords) {
		int phoneId = SubscriptionManager.getPhoneId(subId);
		if (validatePhoneId(phoneId)) {
		mPhysicalChannelConfigs.set(phoneId, configs);
		for (Record r : mRecords) {

+1 −2

Original line number	Diff line number	Diff line
		@@ -68,8 +68,7 @@ interface ITelephonyRegistry {
		void notifyOtaspChanged(in int subId, in int otaspMode);
		@UnsupportedAppUsage
		void notifyCellInfo(in List<CellInfo> cellInfo);
		void notifyPhysicalChannelConfiguration(in List<PhysicalChannelConfig> configs);
		void notifyPhysicalChannelConfigurationForSubscriber(in int subId,
		void notifyPhysicalChannelConfigurationForSubscriber(in int phoneId, in int subId,
		in List<PhysicalChannelConfig> configs);
		void notifyPreciseCallState(int phoneId, int subId, int ringingCallState,
		int foregroundCallState, int backgroundCallState);