Merge "[Telephony] getDataNetworkType() uses incorrect subid" am: 7e9c93dc7c am: dbefe004fe

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1682946

Change-Id: I155dbd1381ab6d0388da5fb6a3f66fd0cf9f906a
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 8647461..34f5d61 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -4728,8 +4728,8 @@
      */
     @Override
     public int getDataNetworkType(String callingPackage, String callingFeatureId) {
-        return getDataNetworkTypeForSubscriber(getDefaultSubscription(), callingPackage,
-                callingFeatureId);
+        return getDataNetworkTypeForSubscriber(mSubscriptionController.getDefaultDataSubId(),
+                callingPackage, callingFeatureId);
     }
 
     /**