diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2011-04-08 16:44:42 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-08 16:44:42 -0700 |
| commit | 2270d05698c161bb10f7a63c2c4d246c95448fb0 (patch) | |
| tree | 24cae223f83722df573c909531a8216d0f2fff50 /telephony | |
| parent | 9e1e1360d3f8910e9f0c7d6f16ea0e4f12bcf8cc (diff) | |
| parent | ede9ed9f704979a373b6b8676373611409cff92f (diff) | |
| download | frameworks_base-2270d05698c161bb10f7a63c2c4d246c95448fb0.zip frameworks_base-2270d05698c161bb10f7a63c2c4d246c95448fb0.tar.gz frameworks_base-2270d05698c161bb10f7a63c2c4d246c95448fb0.tar.bz2 | |
am ede9ed9f: am 1eeeae59: Merge "Fix getActiveApnTypes for GsmDCT." into honeycomb-LTE
* commit 'ede9ed9f704979a373b6b8676373611409cff92f':
Fix getActiveApnTypes for GsmDCT.
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java index ecc29e6..e0f3a1d 100644 --- a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java +++ b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java @@ -199,6 +199,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker { destroyDataConnections(); } + @Override public boolean isApnTypeActive(String type) { ApnContext apnContext = mApnContexts.get(type); if (apnContext == null) return false; @@ -206,7 +207,6 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker { return (apnContext.getDataConnection() != null); } - /** * The only circumstances under which we report that data connectivity is not * possible are @@ -319,7 +319,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker { @Override // Return all active apn types - public synchronized String[] getActiveApnTypes() { + public String[] getActiveApnTypes() { if (DBG) log("get all active apn types"); ArrayList<String> result = new ArrayList<String>(); |