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

* commit '1eeeae59d07ccc6b7db865b942d3e0b9394b1a59':
  Fix getActiveApnTypes for GsmDCT.

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 ecc29e60f6b2..e0f3a1d2a9ee 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>();