commit eda51b595f8c508bff0d7659580527b51bd5bb8c
author Hunsuk Choi <forestchoi@google.com> Wed Sep 28 23:05:59 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 28 23:05:59 2022 +0000
tree afea07066c49fb20c565a779e8a6e66034496b04
parent 79830e13e5e4b4deffa9c0841db280b2f9ee2c9c
parent 221eb8e0c0a849dcecf13e29da1bedcd20a5d493

Merge "Make new fields backward compatible."

radio/aidl/aidl_api/android.hardware.radio.network/current/android/hardware/radio/network/EmergencyRegResult.aidl

diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/current/android/hardware/radio/network/EmergencyRegResult.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/current/android/hardware/radio/network/EmergencyRegResult.aidl
index 523d1aa..af17b43 100644
--- a/radio/aidl/aidl_api/android.hardware.radio.network/current/android/hardware/radio/network/EmergencyRegResult.aidl
+++ b/radio/aidl/aidl_api/android.hardware.radio.network/current/android/hardware/radio/network/EmergencyRegResult.aidl
@@ -40,6 +40,6 @@
   boolean isEmcBearerSupported;
   byte nwProvidedEmc;
   byte nwProvidedEmf;
-  String mcc;
-  String mnc;
+  String mcc = "";
+  String mnc = "";
 }

radio/aidl/android/hardware/radio/network/EmergencyRegResult.aidl

diff --git a/radio/aidl/android/hardware/radio/network/EmergencyRegResult.aidl b/radio/aidl/android/hardware/radio/network/EmergencyRegResult.aidl
index c22317a..ec70e17 100644
--- a/radio/aidl/android/hardware/radio/network/EmergencyRegResult.aidl
+++ b/radio/aidl/android/hardware/radio/network/EmergencyRegResult.aidl
@@ -16,8 +16,8 @@
 
 package android.hardware.radio.network;
 import android.hardware.radio.AccessNetwork;
-import android.hardware.radio.network.RegState;
 import android.hardware.radio.network.Domain;
+import android.hardware.radio.network.RegState;
 
 @VintfStability
 @JavaDerive(toString=true)
@@ -56,8 +56,8 @@
     byte nwProvidedEmf;
 
     /** 3-digit Mobile Country Code, 000..999, empty string if unknown. */
-    String mcc;
+    String mcc = "";
 
     /** 2 or 3-digit Mobile Network Code, 00..999, empty string if unknown. */
-    String mnc;
+    String mnc = "";
 }