Merge "LTE+ indicator not shown when attached to CA network" am: 1926b83e85

Change-Id: I85ce9363482a09aea2ce58940cdec41ee618ee8b
This commit is contained in:
Rambo Wang
2020-05-11 20:20:29 +00:00
committed by Automerger Merge Worker

View File

@@ -1392,15 +1392,16 @@ public class ServiceState implements Parcelable {
/** @hide */ /** @hide */
public boolean isUsingCarrierAggregation() { public boolean isUsingCarrierAggregation() {
boolean isUsingCa = false;
NetworkRegistrationInfo nri = getNetworkRegistrationInfo( NetworkRegistrationInfo nri = getNetworkRegistrationInfo(
NetworkRegistrationInfo.DOMAIN_PS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN); NetworkRegistrationInfo.DOMAIN_PS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN);
if (nri != null) { if (nri != null) {
DataSpecificRegistrationInfo dsri = nri.getDataSpecificInfo(); DataSpecificRegistrationInfo dsri = nri.getDataSpecificInfo();
if (dsri != null) { if (dsri != null) {
return dsri.isUsingCarrierAggregation(); isUsingCa = dsri.isUsingCarrierAggregation();
} }
} }
return false; return isUsingCa || getCellBandwidths().length > 1;
} }
/** @hide */ /** @hide */