PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Settings] Support of DSDS API" into rvc-dev am: 57c2df4c7c

Browse Source 
Change-Id: I09ceb36bc6c8e73737bdb72c7bcc65080181b7ed
This commit is contained in:
Bonian Chen
2020-04-21 08:18:04 +00:00
committed by Automerger Merge Worker
parent 9df4b0ce58 57c2df4c7c
commit 05a2603d55
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/datausage/BillingCyclePreference.java
View File

@@ -20,6 +20,7 @@ import android.content.Intent;
import android.net.NetworkTemplate; import android.net.NetworkTemplate;
import android.os.Bundle; import android.os.Bundle;
import android.os.RemoteException; import android.os.RemoteException;
import android.telephony.data.ApnSetting;
import android.util.AttributeSet; import android.util.AttributeSet;
import androidx.preference.Preference; import androidx.preference.Preference;
@@ -76,7 +77,8 @@ public class BillingCyclePreference extends Preference
private void updateEnabled() { private void updateEnabled() {
try { try {
setEnabled(mServices.mNetworkService.isBandwidthControlEnabled() setEnabled(mServices.mNetworkService.isBandwidthControlEnabled()
&& mServices.mTelephonyManager.getDataEnabled(mSubId) && mServices.mTelephonyManager.createForSubscriptionId(mSubId)
.isDataEnabledForApn(ApnSetting.TYPE_DEFAULT)
&& mServices.mUserManager.isAdminUser()); && mServices.mUserManager.isAdminUser());
} catch (RemoteException e) { } catch (RemoteException e) {
setEnabled(false); setEnabled(false);