commit 360ccaa3da14e06b76d4ca55afc122cb309c67d1
author Jack Yu <jackyu@google.com> Thu May 18 15:15:06 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu May 18 15:15:06 2017 +0000
tree 56d13980b420025dbdfc0ab39acdb23fa4e2f4cd
parent 8ff2db71459eecef71d5706b422c0b0ea944a492
parent 4eb31320fd206577aab5f62dac6be38f2cf6d434

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

Change-Id: I315d43ab6b7da531b08a1446ddd403b3d32f7c05

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index f181e41..f0fca6f 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -1549,13 +1549,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;
         }