From fbd5421ab345e98f12be42bb74991bb47745b9a1 Mon Sep 17 00:00:00 2001
From: Hunsuk Choi <forestchoi@google.com>
Date: Fri, 16 Sep 2022 07:53:50 +0000
Subject: [PATCH] Add mcc and mnc to EmergencyRegResult

Indicating the identity of PLMN.

Test: Functional test on test device.
Bug: 243344927

Change-Id: I385d2099893d3b68c2520b8fb7a732c05dfdf366
---
 .../android/hardware/radio/network/EmergencyRegResult.aidl  | 2 ++
 .../android/hardware/radio/network/EmergencyRegResult.aidl  | 6 ++++++
 2 files changed, 8 insertions(+)

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 cb598f3e5d..523d1aa52e 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,4 +40,6 @@ parcelable EmergencyRegResult {
   boolean isEmcBearerSupported;
   byte nwProvidedEmc;
   byte nwProvidedEmf;
+  String mcc;
+  String mnc;
 }
diff --git a/radio/aidl/android/hardware/radio/network/EmergencyRegResult.aidl b/radio/aidl/android/hardware/radio/network/EmergencyRegResult.aidl
index cf5caa45b8..c22317aced 100644
--- a/radio/aidl/android/hardware/radio/network/EmergencyRegResult.aidl
+++ b/radio/aidl/android/hardware/radio/network/EmergencyRegResult.aidl
@@ -54,4 +54,10 @@ parcelable EmergencyRegResult {
      * This should not be set if UE is not in 5G mode.
      */
     byte nwProvidedEmf;
+
+    /** 3-digit Mobile Country Code, 000..999, empty string if unknown. */
+    String mcc;
+
+    /** 2 or 3-digit Mobile Network Code, 00..999, empty string if unknown. */
+    String mnc;
 }