commit f379b8b03e6a243fd5f044cd99fccf53d962917b
author SongFerngWang <songferngwang@google.com> Mon Dec 23 18:24:44 2019 +0800
committer SongFerngWang <songferngwang@google.com> Fri Jan 17 14:14:49 2020 +0800
tree e0681b38a06ae2c1ce501c4783857f43211d309f
parent 1bb5a6f4ef53e5c6ca52059d4ce3c4561f0a7869

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
Merged-In: Id458f4e030186d4bb91573ba638e63280f246df3

src/com/android/phone/ServiceStateProvider.java

diff --git a/src/com/android/phone/ServiceStateProvider.java b/src/com/android/phone/ServiceStateProvider.java
index 69ea27c..9e6ea83 100644
--- a/src/com/android/phone/ServiceStateProvider.java
+++ b/src/com/android/phone/ServiceStateProvider.java
@@ -209,8 +209,8 @@
             }
 
             // Build the result
-            final int voice_reg_state = ss.getVoiceRegState();
-            final int data_reg_state = ss.getDataRegState();
+            final int voice_reg_state = ss.getState();
+            final int data_reg_state = ss.getDataRegistrationState();
             final int voice_roaming_type = ss.getVoiceRoamingType();
             final int data_roaming_type = ss.getDataRoamingType();
             final String voice_operator_alpha_long = ss.getOperatorAlphaLong();
@@ -324,11 +324,11 @@
     }
 
     private static boolean voiceRegStateChanged(ServiceState oldSS, ServiceState newSS) {
-        return oldSS.getVoiceRegState() != newSS.getVoiceRegState();
+        return oldSS.getState() != newSS.getState();
     }
 
     private static boolean dataRegStateChanged(ServiceState oldSS, ServiceState newSS) {
-        return oldSS.getDataRegState() != newSS.getDataRegState();
+        return oldSS.getDataRegistrationState() != newSS.getDataRegistrationState();
     }
 
     private static boolean voiceRoamingTypeChanged(ServiceState oldSS, ServiceState newSS) {