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

Merge "Add debug dataEnable." into lmp-mr1-dev

Browse Source
This commit is contained in:
Wink Saville
2014-12-09 17:52:19 +00:00
committed by Android (Google) Code Review
parent 1e1251cc04 a4f4d185cf
commit 85d3b0fa6e
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/android/settings/DataUsageSummary.java
View File

@@ -966,22 +966,29 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
} }
/** /**
* Local cache of value, used to work around delay when * Local cache of value, used to work around delays.
* {@link ConnectivityManager#setMobileDataEnabled(boolean)} is async.
*/ */
private Boolean mMobileDataEnabled; private Boolean mMobileDataEnabled;
private boolean isMobileDataEnabled(int subId) { private boolean isMobileDataEnabled(int subId) {
if (LOGD) Log.d(TAG, "isMobileDataEnabled:+ subId=" + subId);
boolean isEnable = false; boolean isEnable = false;
if (mMobileDataEnabled != null) { if (mMobileDataEnabled != null) {
// TODO: deprecate and remove this once enabled flag is on policy // TODO: deprecate and remove this once enabled flag is on policy
// Multiple Subscriptions, the value need to be reseted // Multiple Subscriptions, the value need to be reseted
isEnable = mMobileDataEnabled.booleanValue(); isEnable = mMobileDataEnabled.booleanValue();
if (LOGD) {
Log.d(TAG, "isMobileDataEnabled: != null, subId=" + subId
+ " isEnable=" + isEnable);
}
mMobileDataEnabled = null; mMobileDataEnabled = null;
} else { } else {
//SUB SELECT // SUB SELECT
isEnable = mTelephonyManager.getDataEnabled() isEnable = mTelephonyManager.getDataEnabled(subId);
&& (subId == mSubscriptionManager.getDefaultDataSubId()); if (LOGD) {
Log.d(TAG, "isMobileDataEnabled: == null, subId=" + subId
+ " isEnable=" + isEnable);
}
} }
return isEnable; return isEnable;
} }