From 398e84dd6fe6a399680bd9cd64a58c1704c6c141 Mon Sep 17 00:00:00 2001
From: Jordan Liu <jminjie@google.com>
Date: Mon, 12 Nov 2018 10:49:10 -0800
Subject: [PATCH] Add EID to 1.3::CardStatus

The EID should be reported for any GSM compliant eUICCs.

Test: make
Bug: 116656814
Change-Id: I3090f13084b474a9236b43bfb96da3db4003b382
---
 radio/1.3/Android.bp         |  1 +
 radio/1.3/IRadioResponse.hal | 15 +++++++++++++++
 radio/1.3/types.hal          | 13 +++++++++++++
 3 files changed, 29 insertions(+)

diff --git a/radio/1.3/Android.bp b/radio/1.3/Android.bp
index 3c6518086d..7012f6bab3 100644
--- a/radio/1.3/Android.bp
+++ b/radio/1.3/Android.bp
@@ -24,6 +24,7 @@ hidl_interface {
         "CellConfigLte",
         "CellInfo",
         "CellInfoLte",
+        "CardStatus",
         "DataProfileInfo",
         "DataRegStateResult",
         "EmergencyNumber",
diff --git a/radio/1.3/IRadioResponse.hal b/radio/1.3/IRadioResponse.hal
index 75d1501e47..fecd951a50 100644
--- a/radio/1.3/IRadioResponse.hal
+++ b/radio/1.3/IRadioResponse.hal
@@ -72,4 +72,19 @@ interface IRadioResponse extends @1.2::IRadioResponse {
      */
     oneway getDataRegistrationStateResponse_1_3(RadioResponseInfo info,
             DataRegStateResult dataRegResponse);
+
+    /**
+     * @param info Response info struct containing response type, serial no. and error
+     * @param cardStatus ICC card status as defined by CardStatus in types.hal
+     *
+     * Valid errors returned:
+     *   RadioError:NONE
+     *   RadioError:RADIO_NOT_AVAILABLE
+     *   RadioError:INTERNAL_ERR
+     *   RadioError:NO_MEMORY
+     *   RadioError:NO_RESOURCES
+     *   RadioError:CANCELLED
+     *   RadioError:REQUEST_NOT_SUPPORTED
+     */
+    oneway getIccCardStatusResponse_1_3(RadioResponseInfo info, CardStatus cardStatus);
 };
diff --git a/radio/1.3/types.hal b/radio/1.3/types.hal
index b161e0ecd6..d3a6f7822f 100644
--- a/radio/1.3/types.hal
+++ b/radio/1.3/types.hal
@@ -33,6 +33,7 @@ import @1.2::CellInfoGsm;
 import @1.2::CellInfoLte;
 import @1.2::CellInfoTdscdma;
 import @1.2::CellInfoWcdma;
+import @1.2::CardStatus;
 import @1.2::CellIdentity;
 import @1.2::DataRegStateResult;
 
@@ -325,3 +326,15 @@ struct DataProfileInfo {
      */
     bool persistent;
 };
+
+struct CardStatus {
+    @1.2::CardStatus base;
+    /**
+     * The EID is the eUICC identifier. The EID shall be stored within the ECASD and can be
+     * retrieved by the Device at any time using the standard GlobalPlatform GET DATA command.
+     *
+     * This data is mandatory and applicable only when cardState is CardState:PRESENT and SIM card
+     * supports eUICC.
+     */
+    string eid;
+};