Merge "[Telephony] Notify onLinkCapacityEstimateChanged" into sc-dev (49e3df19) · Commits · e / os / android_frameworks_opt_telephony

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

+8 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import android.telephony.BarringInfo;
		import android.telephony.CallQuality;
		import android.telephony.CellIdentity;
		import android.telephony.CellInfo;
		import android.telephony.LinkCapacityEstimate;
		import android.telephony.PhoneCapability;
		import android.telephony.PhysicalChannelConfig;
		import android.telephony.PreciseCallState;
		@@ -257,6 +258,13 @@ public class DefaultPhoneNotifier implements PhoneNotifier {
		sender.getSubId(), reason, allowedNetworkType);
		}

		@Override
		public void notifyLinkCapacityEstimateChanged(Phone sender,
		List<LinkCapacityEstimate> linkCapacityEstimateList) {
		mTelephonyRegistryMgr.notifyLinkCapacityEstimateChanged(sender.getPhoneId(),
		sender.getSubId(), linkCapacityEstimateList);
		}

		/**
		* Convert the {@link DataActivityState} enum into the TelephonyManager.DATA_* constants for the
		* public API.

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

+6 −30

Original line number	Diff line number	Diff line
		@@ -63,10 +63,10 @@ import android.telecom.TelecomManager;
		import android.telecom.VideoProfile;
		import android.telephony.AccessNetworkConstants;
		import android.telephony.BarringInfo;
		import android.telephony.CarrierBandwidth;
		import android.telephony.CarrierConfigManager;
		import android.telephony.CellIdentity;
		import android.telephony.ImsiEncryptionInfo;
		import android.telephony.LinkCapacityEstimate;
		import android.telephony.NetworkScanRequest;
		import android.telephony.PhoneNumberUtils;
		import android.telephony.RadioAccessFamily;
		@@ -262,7 +262,6 @@ public class GsmCdmaPhone extends Phone {
		private CarrierInfoManager mCIM;

		private final SettingsObserver mSettingsObserver;
		private CarrierBandwidth mCarrierBandwidth = new CarrierBandwidth();

		private final ImsManagerFactory mImsManagerFactory;

		@@ -556,35 +555,12 @@ public class GsmCdmaPhone extends Phone {
		}
		}

		/**
		* get carrier bandwidth per primary and secondary carrier
		* @return CarrierBandwidth with bandwidth of both primary and secondary carrier.
		*/
		public CarrierBandwidth getCarrierBandwidth() {
		return mCarrierBandwidth;
		}

		private void updateCarrierBandwidths(LinkCapacityEstimate lce) {
		if (DBG) logd("updateCarrierBandwidths: lce=" + lce);
		if (lce == null) {
		mCarrierBandwidth = new CarrierBandwidth();
		private void updateLinkCapacityEstimate(List<LinkCapacityEstimate> linkCapacityEstimateList) {
		if (DBG) logd("updateLinkCapacityEstimate: lce list=" + linkCapacityEstimateList);
		if (linkCapacityEstimateList == null) {
		return;
		}
		int primaryDownlinkCapacityKbps = lce.downlinkCapacityKbps;
		int primaryUplinkCapacityKbps = lce.uplinkCapacityKbps;
		if (primaryDownlinkCapacityKbps != CarrierBandwidth.INVALID
		&& lce.secondaryDownlinkCapacityKbps != CarrierBandwidth.INVALID) {
		primaryDownlinkCapacityKbps =
		lce.downlinkCapacityKbps - lce.secondaryDownlinkCapacityKbps;
		}
		if (primaryUplinkCapacityKbps != CarrierBandwidth.INVALID
		&& lce.secondaryUplinkCapacityKbps != CarrierBandwidth.INVALID) {
		primaryUplinkCapacityKbps =
		lce.uplinkCapacityKbps - lce.secondaryUplinkCapacityKbps;
		}
		mCarrierBandwidth = new CarrierBandwidth(primaryDownlinkCapacityKbps,
		primaryUplinkCapacityKbps, lce.secondaryDownlinkCapacityKbps,
		lce.secondaryUplinkCapacityKbps);
		notifyLinkCapacityEstimateChanged(linkCapacityEstimateList);
		}

		@Override
		@@ -2893,7 +2869,7 @@ public class GsmCdmaPhone extends Phone {
		case EVENT_LINK_CAPACITY_CHANGED:
		ar = (AsyncResult) msg.obj;
		if (ar.exception == null && ar.result != null) {
		updateCarrierBandwidths((LinkCapacityEstimate) ar.result);
		updateLinkCapacityEstimate((List<LinkCapacityEstimate>) ar.result);
		} else {
		logd("Unexpected exception on EVENT_LINK_CAPACITY_CHANGED");
		}

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

+7 −9

Original line number	Diff line number	Diff line
		@@ -43,13 +43,13 @@ import android.sysprop.TelephonyProperties;
		import android.telecom.VideoProfile;
		import android.telephony.AccessNetworkConstants;
		import android.telephony.Annotation.ApnType;
		import android.telephony.CarrierBandwidth;
		import android.telephony.CarrierConfigManager;
		import android.telephony.CarrierRestrictionRules;
		import android.telephony.CellIdentity;
		import android.telephony.CellInfo;
		import android.telephony.ClientRequestStats;
		import android.telephony.ImsiEncryptionInfo;
		import android.telephony.LinkCapacityEstimate;
		import android.telephony.PhoneStateListener;
		import android.telephony.PhysicalChannelConfig;
		import android.telephony.PreciseDataConnectionState;
		@@ -2246,14 +2246,6 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		mCi.isNrDualConnectivityEnabled(message, workSource);
		}

		/**
		* get carrier bandwidth per primary and secondary carrier
		* @return CarrierBandwidth with bandwidth of both primary and secondary carrier.
		*/
		public CarrierBandwidth getCarrierBandwidth() {
		return new CarrierBandwidth();
		}

		/**
		* Enable/Disable E-UTRA-NR Dual Connectivity
		* @param nrDualConnectivityState expected NR dual connectivity state
		@@ -2834,6 +2826,12 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		mNotifier.notifyDataEnabled(this, enabled, reason);
		}

		/** Notify link capacity estimate has changed. */
		public void notifyLinkCapacityEstimateChanged(
		List<LinkCapacityEstimate> linkCapacityEstimateList) {
		mNotifier.notifyLinkCapacityEstimateChanged(this, linkCapacityEstimateList);
		}

		/**
		* @return true if a mobile originating emergency call is active
		*/

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

+5 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import android.telephony.BarringInfo;
		import android.telephony.CallQuality;
		import android.telephony.CellIdentity;
		import android.telephony.CellInfo;
		import android.telephony.LinkCapacityEstimate;
		import android.telephony.PhoneCapability;
		import android.telephony.PhysicalChannelConfig;
		import android.telephony.PreciseDataConnectionState;
		@@ -127,4 +128,8 @@ public interface PhoneNotifier {

		/** Notify Allowed Network Type has changed. */
		void notifyAllowedNetworkTypesChanged(Phone sender, int reason, long allowedNetworkType);

		/** Notify link capacity estimate has changed. */
		void notifyLinkCapacityEstimateChanged(Phone sender,
		List<LinkCapacityEstimate> linkCapacityEstimateList);
		}

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

+35 −20

Original line number	Diff line number	Diff line
		@@ -89,6 +89,7 @@ import android.telephony.CellSignalStrengthTdscdma;
		import android.telephony.CellSignalStrengthWcdma;
		import android.telephony.ClientRequestStats;
		import android.telephony.ImsiEncryptionInfo;
		import android.telephony.LinkCapacityEstimate;
		import android.telephony.ModemActivityInfo;
		import android.telephony.NeighboringCellInfo;
		import android.telephony.NetworkScanRequest;
		@@ -7224,35 +7225,49 @@ public class RIL extends BaseCommands implements CommandsInterface {
		return rc;
		}

		static LinkCapacityEstimate convertHalLceData(LceDataInfo halData, RIL ril) {
		final LinkCapacityEstimate lce = new LinkCapacityEstimate(
		static List<LinkCapacityEstimate> convertHalLceData(LceDataInfo halData, RIL ril) {
		final List<LinkCapacityEstimate> lceList = new ArrayList<>();
		lceList.add(new LinkCapacityEstimate(LinkCapacityEstimate.LCE_TYPE_COMBINED,
		halData.lastHopCapacityKbps,
		Byte.toUnsignedInt(halData.confidenceLevel),
		halData.lceSuspended ? LinkCapacityEstimate.STATUS_SUSPENDED
		: LinkCapacityEstimate.STATUS_ACTIVE);

		ril.riljLog("LCE capacity information received:" + lce);
		return lce;
		LinkCapacityEstimate.INVALID));
		ril.riljLog("LCE capacity information received:" + lceList);
		return lceList;
		}

		static LinkCapacityEstimate convertHalLceData(
		static List<LinkCapacityEstimate> convertHalLceData(
		android.hardware.radio.V1_2.LinkCapacityEstimate halData, RIL ril) {
		final LinkCapacityEstimate lce = new LinkCapacityEstimate(
		final List<LinkCapacityEstimate> lceList = new ArrayList<>();
		lceList.add(new LinkCapacityEstimate(LinkCapacityEstimate.LCE_TYPE_COMBINED,
		halData.downlinkCapacityKbps,
		halData.uplinkCapacityKbps);
		ril.riljLog("LCE capacity information received:" + lce);
		return lce;
		halData.uplinkCapacityKbps));
		ril.riljLog("LCE capacity information received:" + lceList);
		return lceList;
		}

		static LinkCapacityEstimate convertHalLceData(
		static List<LinkCapacityEstimate> convertHalLceData(
		android.hardware.radio.V1_6.LinkCapacityEstimate halData, RIL ril) {
		final LinkCapacityEstimate lce = new LinkCapacityEstimate(
		halData.downlinkCapacityKbps,
		halData.uplinkCapacityKbps,
		final List<LinkCapacityEstimate> lceList = new ArrayList<>();
		int primaryDownlinkCapacityKbps = halData.downlinkCapacityKbps;
		int primaryUplinkCapacityKbps = halData.uplinkCapacityKbps;
		if (primaryDownlinkCapacityKbps != LinkCapacityEstimate.INVALID
		&& halData.secondaryDownlinkCapacityKbps != LinkCapacityEstimate.INVALID) {
		primaryDownlinkCapacityKbps =
		halData.downlinkCapacityKbps - halData.secondaryDownlinkCapacityKbps;
		}
		if (primaryUplinkCapacityKbps != LinkCapacityEstimate.INVALID
		&& halData.secondaryUplinkCapacityKbps != LinkCapacityEstimate.INVALID) {
		primaryUplinkCapacityKbps =
		halData.uplinkCapacityKbps - halData.secondaryUplinkCapacityKbps;
		}

		lceList.add(new LinkCapacityEstimate(LinkCapacityEstimate.LCE_TYPE_PRIMARY,
		primaryDownlinkCapacityKbps,
		primaryUplinkCapacityKbps));
		lceList.add(new LinkCapacityEstimate(LinkCapacityEstimate.LCE_TYPE_SECONDARY,
		halData.secondaryDownlinkCapacityKbps,
		halData.secondaryUplinkCapacityKbps);
		ril.riljLog("LCE capacity information received:" + lce);
		return lce;
		halData.secondaryUplinkCapacityKbps));
		ril.riljLog("LCE capacity information received:" + lceList);
		return lceList;
		}

		/**