commit 4eb31320fd206577aab5f62dac6be38f2cf6d434
author Jack Yu <jackyu@google.com> Thu May 18 06:59:24 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu May 18 06:59:24 2017 +0000
tree 1617b3c40794f9d1078ce8b69297043ee479a0d2
parent 929867e5254d6c04ba7dc2bedd7e4e4cc944ffac
parent 5bc6ab644585379898b027233c78739483d41e54

Merge "Consolidated all data allow/disallow logic into one method" am: 5d3bcfc78d
am: 5bc6ab6445

Change-Id: Ic2829b66bb30141aba2418651e354e32076be1e8

src/com/android/phone/PhoneInterfaceManager.java

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;
         }