auto import from //depot/cupcake/@137055

2 files changed, 3 insertions, 10 deletions

diff --git a/location/java/com/android/internal/location/CellState.java b/location/java/com/android/internal/location/CellState.java
index 8f6ca1f..eb6535e 100644
--- a/location/java/com/android/internal/location/CellState.java
+++ b/location/java/com/android/internal/location/CellState.java
@@ -168,15 +168,8 @@ public class CellState {
         }
     }
 
-    public void updateRadioType(TelephonyManager telephonyManager) {
-        // Get radio type
-        int radioType = telephonyManager.getNetworkType();
-        if (radioType == TelephonyManager.NETWORK_TYPE_GPRS ||
-            radioType == TelephonyManager.NETWORK_TYPE_EDGE) {
-            mRadioType = RADIO_TYPE_GPRS;
-        } else if (radioType == TelephonyManager.NETWORK_TYPE_UMTS) {
-            mRadioType = RADIO_TYPE_WCDMA;
-        }
+    public void updateRadioType(int radioType) {
+        mRadioType = radioType;
 
         if (Log.isLoggable(TAG, Log.VERBOSE)) {
             Log.d(TAG, "updateRadioType(): " + mLac +"," + mCid + "," + mMnc +"," + mMcc + "," +
diff --git a/location/java/com/android/internal/location/INetworkLocationManager.java b/location/java/com/android/internal/location/INetworkLocationManager.java
index 6b632fd..d85ff0a 100644
--- a/location/java/com/android/internal/location/INetworkLocationManager.java
+++ b/location/java/com/android/internal/location/INetworkLocationManager.java
@@ -28,7 +28,7 @@ public interface INetworkLocationManager {
 
     /* callback to allow installation to occur in Location Manager's thread */
     public interface InstallCallback {
-        void installNetworkLocationProvider(Context context, INetworkLocationManager manager);
+        void installNetworkLocationProvider(INetworkLocationManager manager);
     }
     
     void setInstallCallback(InstallCallback callback);