Merge "Listen to phone based signalStrength changed" into udc-qpr-dev (5a54125e) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/data/LinkBandwidthEstimator.java

+5 −10

Original line number	Diff line number	Diff line
		@@ -315,6 +315,8 @@ public class LinkBandwidthEstimator extends Handler {
		registerNrStateFrequencyChange();
		mPhone.getServiceStateTracker().registerForDataRegStateOrRatChanged(AccessNetworkConstants
		.TRANSPORT_TYPE_WWAN, this, MSG_DATA_REG_STATE_OR_RAT_CHANGED, null);
		mPhone.getSignalStrengthController().registerForSignalStrengthChanged(this,
		MSG_SIGNAL_STRENGTH_CHANGED, null);
		}

		@Override
		@@ -333,7 +335,7 @@ public class LinkBandwidthEstimator extends Handler {
		handleDefaultNetworkChanged((NetworkCapabilities) msg.obj);
		break;
		case MSG_SIGNAL_STRENGTH_CHANGED:
		handleSignalStrengthChanged((SignalStrength) msg.obj);
		handleSignalStrengthChanged();
		break;
		case MSG_NR_FREQUENCY_CHANGED:
		// fall through
		@@ -917,10 +919,8 @@ public class LinkBandwidthEstimator extends Handler {
		() -> callback.onBandwidthChanged(linkBandwidthTxKps, linkBandwidthRxKps)));
		}

		private void handleSignalStrengthChanged(SignalStrength signalStrength) {
		if (signalStrength == null) {
		return;
		}
		private void handleSignalStrengthChanged() {
		SignalStrength signalStrength = mPhone.getSignalStrength();

		mSignalStrengthDbm = signalStrength.getDbm();
		mSignalLevel = signalStrength.getLevel();
		@@ -1099,13 +1099,8 @@ public class LinkBandwidthEstimator extends Handler {
		}

		private class TelephonyCallbackImpl extends TelephonyCallback implements
		TelephonyCallback.SignalStrengthsListener,
		TelephonyCallback.ActiveDataSubscriptionIdListener {
		@Override
		public void onSignalStrengthsChanged(SignalStrength signalStrength) {
		obtainMessage(MSG_SIGNAL_STRENGTH_CHANGED, signalStrength).sendToTarget();
		}
		@Override
		public void onActiveDataSubscriptionIdChanged(int subId) {
		obtainMessage(MSG_ACTIVE_PHONE_CHANGED, subId).sendToTarget();
		}