Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make getDataEnabled take more into account.

Browse Source 
getDataEnabled and getAnyDataEnabled ignored mMasterDataEnabled.
bug: 2216392

Change-Id: Ic3ae0808d2a02057ddf5056d3e01f754f2e57f5c
This commit is contained in:
Robert Greenwalt
2010-11-11 15:18:51 -08:00
parent 5c7d5ae094
commit ec44c26f42
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
telephony/java/com/android/internal/telephony/DataConnectionTracker.java
View File

@@ -478,7 +478,7 @@ public abstract class DataConnectionTracker extends Handler {
* {@code true} otherwise.
*/
public synchronized boolean getDataEnabled() {
return dataEnabled[APN_DEFAULT_ID];
return (mMasterDataEnabled && dataEnabled[APN_DEFAULT_ID]);
}
/**
@@ -487,8 +487,8 @@ public abstract class DataConnectionTracker extends Handler {
* @return {@code false} if data connectivity has been explicitly disabled,
* {@code true} otherwise.
*/
public boolean getAnyDataEnabled() {
return (enabledCount != 0);
public synchronized boolean getAnyDataEnabled() {
return (mMasterDataEnabled && (enabledCount != 0));
}
protected abstract void startNetStatPoll();
@@ -832,7 +832,9 @@ public abstract class DataConnectionTracker extends Handler {
protected void onSetDataEnabled(boolean enable) {
if (mMasterDataEnabled != enable) {
mMasterDataEnabled = enable;
synchronized (this) {
mMasterDataEnabled = enable;
}
if (enable) {
mRetryMgr.resetRetryCount();
onTrySetupData(Phone.REASON_DATA_ENABLED);