From e92ce14eb79bd5b41da11c457e08fb713fec356a Mon Sep 17 00:00:00 2001
From: Malcolm Chen <refuhoo@google.com>
Date: Tue, 14 Apr 2020 11:19:48 -0700
Subject: [PATCH] Add a @hide API to indicate 5G and DSDS conflict.

Bug: 152786064
Test: build and manual
Change-Id: I79a8fda5b70a31acc365ebcbb03b73b20d2443fd
---
 .../android/telephony/TelephonyManager.java     | 17 +++++++++++++++++
 .../android/internal/telephony/ITelephony.aidl  |  5 +++++
 2 files changed, 22 insertions(+)

diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index d6cdaa6d8bc0c..ad900e1efcfe0 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -13238,4 +13238,21 @@ public class TelephonyManager {
     public static void enableServiceHandleCaching() {
         sServiceHandleCacheEnabled = true;
     }
+
+    /**
+     * Whether device can connect to 5G network when two SIMs are active.
+     * @hide
+     * TODO b/153669716: remove or make system API.
+     */
+    public boolean canConnectTo5GInDsdsMode() {
+        ITelephony telephony = getITelephony();
+        if (telephony == null) return true;
+        try {
+            return telephony.canConnectTo5GInDsdsMode();
+        } catch (RemoteException ex) {
+            return true;
+        } catch (NullPointerException ex) {
+            return true;
+        }
+    }
 }
diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl
index 43aeb19fe1bdc..f5cd68f050a46 100644
--- a/telephony/java/com/android/internal/telephony/ITelephony.aidl
+++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl
@@ -2268,4 +2268,9 @@ interface ITelephony {
      * @return operatorinfo on success
      */
     String getManualNetworkSelectionPlmn(int subId);
+
+    /**
+     * Whether device can connect to 5G network when two SIMs are active.
+     */
+    boolean canConnectTo5GInDsdsMode();
 }