summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Rambo Wang <rambowang@google.com> 2020-05-11 20:04:05 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2020-05-11 20:04:05 +0000
commit1926b83e8523fdb02404093db155074ee230bd3f (patch)
treef6781ec127458ca52eb1e249c121ca947a202d42
parent21467667832bcbb37f3e8ae04638665d93d22d0c (diff)
parent35c8eb194a8baa184521f46ba3c5711265c759b2 (diff)
Merge "LTE+ indicator not shown when attached to CA network"
-rw-r--r--telephony/java/android/telephony/ServiceState.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java
index a269bd1809d4..5c84297d3b86 100644
--- a/telephony/java/android/telephony/ServiceState.java
+++ b/telephony/java/android/telephony/ServiceState.java
@@ -1392,15 +1392,16 @@ public class ServiceState implements Parcelable {
/** @hide */
public boolean isUsingCarrierAggregation() {
+ boolean isUsingCa = false;
NetworkRegistrationInfo nri = getNetworkRegistrationInfo(
NetworkRegistrationInfo.DOMAIN_PS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN);
if (nri != null) {
DataSpecificRegistrationInfo dsri = nri.getDataSpecificInfo();
if (dsri != null) {
- return dsri.isUsingCarrierAggregation();
+ isUsingCa = dsri.isUsingCarrierAggregation();
}
}
- return false;
+ return isUsingCa || getCellBandwidths().length > 1;
}
/** @hide */