commit 358d253b58a9727e4b8e991f0e935f92542f10bf
author Brad Ebinger <breadley@google.com> Fri Jul 12 22:59:43 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jul 12 22:59:43 2019 +0000
tree 9b812a43d411509d5295ccf0b3862cdd795493f5
parent 628cd1a629761f5a469bd661f1ff454c68b4f4c9
parent d432c16e4d974fbfc7202a7fc22b7a2be467ad1c

Merge "Switch DDS on MSIM emergency call"

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 87b2033..6c60f1f 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -1872,9 +1872,14 @@
 
     @Override
     public int getDataState() {
+        return getDataStateForSubId(mSubscriptionController.getDefaultDataSubId());
+    }
+
+    @Override
+    public int getDataStateForSubId(int subId) {
         final long identity = Binder.clearCallingIdentity();
         try {
-            Phone phone = getPhone(mSubscriptionController.getDefaultDataSubId());
+            final Phone phone = getPhone(subId);
             if (phone != null) {
                 return PhoneConstantConversions.convertDataState(phone.getDataConnectionState());
             } else {
@@ -1888,9 +1893,14 @@
 
     @Override
     public int getDataActivity() {
+        return getDataActivityForSubId(mSubscriptionController.getDefaultDataSubId());
+    }
+
+    @Override
+    public int getDataActivityForSubId(int subId) {
         final long identity = Binder.clearCallingIdentity();
         try {
-            Phone phone = getPhone(mSubscriptionController.getDefaultDataSubId());
+            final Phone phone = getPhone(subId);
             if (phone != null) {
                 return DefaultPhoneNotifier.convertDataActivityState(phone.getDataActivityState());
             } else {