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

am 1eeeae59: Merge "Fix getActiveApnTypes for GsmDCT." into honeycomb-LTE

Browse Source 
* commit '1eeeae59d07ccc6b7db865b942d3e0b9394b1a59':
  Fix getActiveApnTypes for GsmDCT.
This commit is contained in:
Robert Greenwalt
2011-04-08 16:38:39 -07:00
committed by Android Git Automerger
parent de78352c6c 1eeeae59d0
commit ede9ed9f70
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
View File

@@ -199,6 +199,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
destroyDataConnections(); destroyDataConnections();
} }
@Override
public boolean isApnTypeActive(String type) { public boolean isApnTypeActive(String type) {
ApnContext apnContext = mApnContexts.get(type); ApnContext apnContext = mApnContexts.get(type);
if (apnContext == null) return false; if (apnContext == null) return false;
@@ -206,7 +207,6 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
return (apnContext.getDataConnection() != null); return (apnContext.getDataConnection() != null);
} }
/** /**
* The only circumstances under which we report that data connectivity is not * The only circumstances under which we report that data connectivity is not
* possible are * possible are
@@ -319,7 +319,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker {
@Override @Override
// Return all active apn types // Return all active apn types
public synchronized String[] getActiveApnTypes() { public String[] getActiveApnTypes() {
if (DBG) log("get all active apn types"); if (DBG) log("get all active apn types");
ArrayList<String> result = new ArrayList<String>(); ArrayList<String> result = new ArrayList<String>();