commit d3f9cdd5be5479c3a60aeadcdd3e0bf447422874
author Treehugger Robot <treehugger-gerrit@google.com> Fri Sep 10 21:43:00 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 10 21:43:00 2021 +0000
tree d7b4ddb4742d34fa80b1018b4403e1b137f67995
parent 831f78825be220d48e1f72481fae0c9d454713cb
parent aa150426def1af680ec8b7671414f12386ce270d

Merge "Deep copy service state object"

telephony/java/android/telephony/ServiceState.java

diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java
index 6da61b7..1677c61 100644
--- a/telephony/java/android/telephony/ServiceState.java
+++ b/telephony/java/android/telephony/ServiceState.java
@@ -444,7 +444,9 @@
         mArfcnRsrpBoost = s.mArfcnRsrpBoost;
         synchronized (mNetworkRegistrationInfos) {
             mNetworkRegistrationInfos.clear();
-            mNetworkRegistrationInfos.addAll(s.getNetworkRegistrationInfoList());
+            for (NetworkRegistrationInfo nri : s.getNetworkRegistrationInfoList()) {
+                mNetworkRegistrationInfos.add(new NetworkRegistrationInfo(nri));
+            }
         }
         mNrFrequencyRange = s.mNrFrequencyRange;
         mOperatorAlphaLongRaw = s.mOperatorAlphaLongRaw;