Merge "Fix getActiveApnTypes for GsmDCT." into honeycomb-LTE
This commit is contained in:
committed by
Android (Google) Code Review
commit
1eeeae59d0
@@ -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>();
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user