Revert "Add a SubId to getDataState and getDataActivity"
This reverts commit cf3aa3afeafe2d14a9e32a3a683991822609ddcd.
Reason for revert: Decision has been made to keep the unsupported AIDL API.
Change-Id: Ida00a0d0b37691cd1293577d6ee9c6e01b074d6a
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 425ad36..f2c15bc 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -1868,10 +1868,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 {
@@ -1884,10 +1884,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 {