From 41fb074832f65baa84cd19589f7b6023e28876ef Mon Sep 17 00:00:00 2001
From: Pengquan Meng <mpq@google.com>
Date: Tue, 20 Nov 2018 19:15:04 -0800
Subject: [PATCH] Add E-UTRA-NR Dual Connectivity indicator to
 DataRegStateResult

Bug: 111454000
Test: build
Change-Id: Ib664f589e1514f6fe9b7dba70d161f4e2103be6f
---
 radio/1.4/Android.bp |  1 +
 radio/1.4/types.hal  | 41 +++++++++++++++++++++++++++++++----------
 2 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/radio/1.4/Android.bp b/radio/1.4/Android.bp
index a450f2028d..c2ba47e8b0 100644
--- a/radio/1.4/Android.bp
+++ b/radio/1.4/Android.bp
@@ -37,6 +37,7 @@ hidl_interface {
         "PhysicalChannelConfig",
         "RadioFrequencyInfo",
         "RadioTechnology",
+        "NrIndicators",
     ],
     gen_java: true,
 }
diff --git a/radio/1.4/types.hal b/radio/1.4/types.hal
index ea3c53f4dd..4e5b288df8 100644
--- a/radio/1.4/types.hal
+++ b/radio/1.4/types.hal
@@ -228,18 +228,18 @@ struct LteVopsInfo {
     bool isEmcBearerSupported;
 };
 
-struct DataRegStateResult {
-    @1.2::DataRegStateResult base;
+/** The parameters of NR 5G Non-Standalone. */
+struct NrIndicators {
     /**
-     * Network capabilities for voice over PS services. This info is valid only
-     * on LTE network and must be present when device is camped on LTE. vopsInfo
-     * will be empty when device is camped only on 2G/3G .
+     * Indicates that if E-UTRA-NR Dual Connectivity (EN-DC) is supported by the primary serving
+     * cell.
+     *
+     * True the primary serving cell is LTE cell and the plmn-InfoList-r15 is present in SIB2 and
+     * at least one bit in this list is true, otherwise this value should be false.
+     *
+     * Reference: 3GPP TS 36.331 v15.2.2 6.3.1 System information blocks.
      */
-    safe_union VopsInfo {
-        Monostate noinit;
-
-        LteVopsInfo lteVopsInfo; // LTE network capability
-    } vopsInfo;
+    bool isEndcAvailable;
 
     /**
      * True if use of dual connectivity with NR is restricted.
@@ -256,6 +256,27 @@ struct DataRegStateResult {
     bool isNrAvailable;
 };
 
+struct DataRegStateResult {
+    @1.2::DataRegStateResult base;
+
+    /**
+     * Network capabilities for voice over PS services. This info is valid only on LTE network and
+     * must be present when device is camped on LTE. vopsInfo must be empty when device is camped
+     * only on 2G/3G.
+     */
+    safe_union VopsInfo {
+        Monostate noinit;
+
+        LteVopsInfo lteVopsInfo; // LTE network capability
+    } vopsInfo;
+
+    /**
+     * The parameters of NR 5G Non-Standalone. This value is only valid on E-UTRAN, otherwise
+     * must be empty.
+     */
+    NrIndicators nrIndicators;
+};
+
 /** Contains the configuration of the LTE cell tower. */
 struct CellConfigLte {
     /**