commit ee830a52a6d9ec70432c1dbb4bcedb679ef2d32a
author Nathan Harold <nharold@google.com> Thu Jun 27 22:11:18 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jun 27 22:11:18 2019 +0000
tree a31524a9555fd9132fb0d198ca2fa7e9a0e27303
parent 7d34dd19674e6c4063083c8f14b27afd9c60aa0c
parent e037c4703115383babe100fb0401dc97950a8af8

Merge "Revert "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 1ba1edd..87b2033 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -1871,10 +1871,10 @@
     }
 
     @Override
-    public int getDataState(int subId) {
+    public int getDataState() {
         final long identity = Binder.clearCallingIdentity();
         try {
-            final Phone phone = getPhone(subId);
+            Phone phone = getPhone(mSubscriptionController.getDefaultDataSubId());
             if (phone != null) {
                 return PhoneConstantConversions.convertDataState(phone.getDataConnectionState());
             } else {
@@ -1887,10 +1887,10 @@
     }
 
     @Override
-    public int getDataActivity(int subId) {
+    public int getDataActivity() {
         final long identity = Binder.clearCallingIdentity();
         try {
-            final Phone phone = getPhone(subId);
+            Phone phone = getPhone(mSubscriptionController.getDefaultDataSubId());
             if (phone != null) {
                 return DefaultPhoneNotifier.convertDataActivityState(phone.getDataActivityState());
             } else {