Support multiple DcTracker for IWLAN refactoring
If the device is configured as AP-assited mode, multiple
DcTrackers will be created for each corresponding
data service. For legacy mode, only one DcTracker will
be created.
Test: Unit tests and telephony sanity tests
Bug: 73659459
Merged-In: Ie72312ff82454eeb008cea5ea3712691a5ec0b3f
Change-Id: Ie72312ff82454eeb008cea5ea3712691a5ec0b3f
(cherry picked from commit b5d8f647afb0075fdb76bdf9e089763b3bf4a7db)
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index cb59583..c19539b 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -79,6 +79,7 @@
import android.telephony.UssdResponse;
import android.telephony.VisualVoicemailSmsFilterSettings;
import android.telephony.cdma.CdmaCellLocation;
+import android.telephony.data.ApnSetting;
import android.telephony.emergency.EmergencyNumber;
import android.telephony.gsm.GsmCellLocation;
import android.telephony.ims.aidl.IImsCapabilityCallback;
@@ -1715,7 +1716,7 @@
try {
final Phone phone = getPhone(subId);
if (phone != null) {
- return phone.isDataAllowed();
+ return phone.isDataAllowed(ApnSetting.TYPE_DEFAULT);
} else {
return false;
}