From aa5e03121f5202c24faed333663893300e37ec46 Mon Sep 17 00:00:00 2001 From: Qiong Liu Date: Mon, 26 Aug 2019 18:58:07 +0800 Subject: [PATCH] 4G+ RAT icon can not be displayed when back to 4G from 4G+ ServiceState#setIsUsingCarrierAggregation() does not work because it sets current CA status to the copied instance but it does not set to the original data. As a result, System UI cannot be determined correctly whether to display the RAT icon as carrier aggregation or not, the problem occurs. To resolve the problem, apply the copied instance to the original data by using addNetworkRegistrationInfo(). Test: manual - Checked that correct RAT icon is displayed according to rat ratchet behavior. Bug: 141276200 Change-Id: Ic9a26ff932647b09d8770304c3057b572afaf2a4 --- telephony/java/android/telephony/ServiceState.java | 1 + 1 file changed, 1 insertion(+) diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java index d7d85c280e19e..003c7ea9300ef 100644 --- a/telephony/java/android/telephony/ServiceState.java +++ b/telephony/java/android/telephony/ServiceState.java @@ -1323,6 +1323,7 @@ public class ServiceState implements Parcelable { DataSpecificRegistrationInfo dsri = nri.getDataSpecificInfo(); if (dsri != null) { dsri.setIsUsingCarrierAggregation(ca); + addNetworkRegistrationInfo(nri); } } }