commit 83021ab06c7201b24a6fe7b8a96866fdcbfc18fe
author Nathan Harold <nharold@google.com> Tue Jun 18 17:44:15 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 18 17:44:15 2019 +0000
tree d17ee297fc88606593f938915f4294f9899c4e29
parent 7c4bf35f19cfbc07b37440b760080ea0a144a0d8
parent cf3aa3afeafe2d14a9e32a3a683991822609ddcd

Merge "Add a SubId to getDataState and getDataActivity"

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 87b2033..1ba1edd 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -1871,10 +1871,10 @@
     }
 
     @Override
-    public int getDataState() {
+    public int getDataState(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 {
@@ -1887,10 +1887,10 @@
     }
 
     @Override
-    public int getDataActivity() {
+    public int getDataActivity(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 {