Consolidated all data allow/disallow logic into one method
Consolidated all data allow/disallow logic into one method
and got rid of the obsolete isDataPossible. This is the
preliminary work for checking if data is allowed just right
before data connection entering connected state.
Test: Telephony sanity tests and unit tests
bug: 33847610
Merged-In: Ia651bcd23241e6c20b5ccc5afbbe139b6dfbabf6
Change-Id: Ia651bcd23241e6c20b5ccc5afbbe139b6dfbabf6
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index c47a37d..a7d0205 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -1541,13 +1541,11 @@
}
}
- // FIXME: subId version needed
@Override
- public boolean isDataConnectivityPossible() {
- int subId = mSubscriptionController.getDefaultDataSubId();
+ public boolean isDataConnectivityPossible(int subId) {
final Phone phone = getPhone(subId);
if (phone != null) {
- return phone.isDataConnectivityPossible();
+ return phone.isDataAllowed();
} else {
return false;
}