From 9443c8e9665dbfa662f5b100144b5607dc1b2ee1 Mon Sep 17 00:00:00 2001
From: Jack Yu <jackyu@google.com>
Date: Mon, 8 Apr 2019 01:10:27 -0700
Subject: [PATCH] Fixed incorrect service state populated

ServiceState.setStateOutOfService does not correctly
clean up the information so the old WLAN registration info
got populated for the next time use.

Bug: 130048577
Test: Telephony sanity tests
Merged-In: I7fab7090c22390914af024c44bffd643c13f33e5
Change-Id: I7fab7090c22390914af024c44bffd643c13f33e5
(cherry picked from commit 9302618da657959c77943d2ecc7705ddf77612ba)
---
 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 f928ba0350aae..f4a6984001cb8 100644
--- a/telephony/java/android/telephony/ServiceState.java
+++ b/telephony/java/android/telephony/ServiceState.java
@@ -1045,6 +1045,7 @@ public class ServiceState implements Parcelable {
         mIsEmergencyOnly = false;
         mLteEarfcnRsrpBoost = 0;
         mNrFrequencyRange = FREQUENCY_RANGE_UNKNOWN;
+        mNetworkRegistrationInfos.clear();
         addNetworkRegistrationInfo(new NetworkRegistrationInfo.Builder()
                 .setDomain(NetworkRegistrationInfo.DOMAIN_CS)
                 .setTransportType(AccessNetworkConstants.TRANSPORT_TYPE_WWAN)