commit 5fde1226ca60cdacbda85ddcf96d29a5a2078bf5
author SongFerngWang <songferngwang@google.com> Mon Dec 23 18:24:44 2019 +0800
committer SongFerngWang <songferngwang@google.com> Mon Dec 23 22:47:20 2019 +0800
tree 87d500c00520d5ce591c13e4cfd76897b1c80adf
parent e875efb631f27728a330e507f9ea04be5bcb994d

mainline:Replace serviceState.getDataRegState and getVoiceRegState

Replace serviceState.getVoiceRegState with getState
Replace serviceState.getDataRegState with getDataRegistrationState

Bug: 146637978
Test: atest TelephonyConnectionServiceTest (PASS)
atest ServiceStateProviderTest (PASS)
atest NumberVerificationManagerTest (PASS)
Change-Id: Id458f4e030186d4bb91573ba638e63280f246df3

src/com/android/phone/NumberVerificationManager.java

diff --git a/src/com/android/phone/NumberVerificationManager.java b/src/com/android/phone/NumberVerificationManager.java
index 9ec16f8..2298d40 100644
--- a/src/com/android/phone/NumberVerificationManager.java
+++ b/src/com/android/phone/NumberVerificationManager.java
@@ -135,7 +135,7 @@
                 }
 
                 // make sure at least one phone is registered for voice
-                if (phone.getServiceState().getVoiceRegState() == ServiceState.STATE_IN_SERVICE) {
+                if (phone.getServiceState().getState() == ServiceState.STATE_IN_SERVICE) {
                     isAnyPhoneVoiceRegistered = true;
                 }
                 // make sure at least one phone has room for an incoming call.