From 8f677012949d775209f740cb1783dece898a4a06 Mon Sep 17 00:00:00 2001
From: Bonian Chen <bonianchen@google.com>
Date: Sun, 19 Apr 2020 21:19:18 +0800
Subject: [PATCH] [Settings] Support of DSDS API

Replacing getDataEnabled() by isDataEnabledForApn().

Bug: 143996139
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=BillingCycleSettingsTest
Change-Id: If36cfcd7c6b44fb89957ebf9f741936041761d9c
---
 .../android/settings/datausage/BillingCyclePreference.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/datausage/BillingCyclePreference.java b/src/com/android/settings/datausage/BillingCyclePreference.java
index 47ef56b2efd..116ed89b3c7 100644
--- a/src/com/android/settings/datausage/BillingCyclePreference.java
+++ b/src/com/android/settings/datausage/BillingCyclePreference.java
@@ -20,6 +20,7 @@ import android.content.Intent;
 import android.net.NetworkTemplate;
 import android.os.Bundle;
 import android.os.RemoteException;
+import android.telephony.data.ApnSetting;
 import android.util.AttributeSet;
 
 import androidx.preference.Preference;
@@ -76,7 +77,8 @@ public class BillingCyclePreference extends Preference
     private void updateEnabled() {
         try {
             setEnabled(mServices.mNetworkService.isBandwidthControlEnabled()
-                    && mServices.mTelephonyManager.getDataEnabled(mSubId)
+                    && mServices.mTelephonyManager.createForSubscriptionId(mSubId)
+                            .isDataEnabledForApn(ApnSetting.TYPE_DEFAULT)
                     && mServices.mUserManager.isAdminUser());
         } catch (RemoteException e) {
             setEnabled(false);