Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b7fa3fa authored by Ricardo Cerqueira's avatar Ricardo Cerqueira Committed by Gerrit Code Review
Browse files

Merge "telephony: neighboring cells are now handled properly" into ics

parents 67ddb854 8ed8ff05

telephony/java/android/telephony/NeighboringCellInfo.java

+6 −4
Original line number Diff line number Diff line
@@ -25,8 +25,7 @@ import static android.telephony.TelephonyManager.NETWORK_TYPE_UMTS; 
import static android.telephony.TelephonyManager.NETWORK_TYPE_HSDPA;

import static android.telephony.TelephonyManager.NETWORK_TYPE_HSUPA;

import static android.telephony.TelephonyManager.NETWORK_TYPE_HSPA;





import static android.telephony.TelephonyManager.NETWORK_TYPE_HSPAP;



/**

 * Represents the neighboring cell information, including
@@ -108,7 +107,8 @@ public class NeighboringCellInfo implements Parcelable 
     * {@link TelephonyManager#NETWORK_TYPE_UMTS TelephonyManager.NETWORK_TYPE_UMTS},

     * {@link TelephonyManager#NETWORK_TYPE_HSDPA TelephonyManager.NETWORK_TYPE_HSDPA},

     * {@link TelephonyManager#NETWORK_TYPE_HSUPA TelephonyManager.NETWORK_TYPE_HSUPA},

     * and {@link TelephonyManager#NETWORK_TYPE_HSPA TelephonyManager.NETWORK_TYPE_HSPA}.

     * {@link TelephonyManager#NETWORK_TYPE_HSPA TelephonyManager.NETWORK_TYPE_HSPA},

     * and {@link TelephonyManager#NETWORK_TYPE_HSPAP TelephonyManager.NETWORK_TYPE_HSPAP}.

     */

    public NeighboringCellInfo(int rssi, String location, int radioType) {

        // set default value
@@ -143,6 +143,7 @@ public class NeighboringCellInfo implements Parcelable 
            case NETWORK_TYPE_HSDPA:

            case NETWORK_TYPE_HSUPA:

            case NETWORK_TYPE_HSPA:

            case NETWORK_TYPE_HSPAP:

                mNetworkType = radioType;

                mPsc = Integer.valueOf(location, 16);

                break;
@@ -218,7 +219,8 @@ public class NeighboringCellInfo implements Parcelable 
     * Return {@link TelephonyManager#NETWORK_TYPE_UMTS TelephonyManager.NETWORK_TYPE_UMTS},

     * {@link TelephonyManager#NETWORK_TYPE_HSDPA TelephonyManager.NETWORK_TYPE_HSDPA},

     * {@link TelephonyManager#NETWORK_TYPE_HSUPA TelephonyManager.NETWORK_TYPE_HSUPA},

     * or {@link TelephonyManager#NETWORK_TYPE_HSPA TelephonyManager.NETWORK_TYPE_HSPA}

     * {@link TelephonyManager#NETWORK_TYPE_HSPA TelephonyManager.NETWORK_TYPE_HSPA},

     * or {@link TelephonyManager#NETWORK_TYPE_HSPAP TelephonyManager.NETWORK_TYPE_HSPAP}

     * means that Neighboring Cell information is stored for UMTS network, in

     * which {@link NeighboringCellInfo#getPsc NeighboringCellInfo.getPsc}

     * should be called to access location.

telephony/java/com/android/internal/telephony/RIL.java

+7 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import static android.telephony.TelephonyManager.NETWORK_TYPE_UMTS; 
import static android.telephony.TelephonyManager.NETWORK_TYPE_HSDPA;

import static android.telephony.TelephonyManager.NETWORK_TYPE_HSUPA;

import static android.telephony.TelephonyManager.NETWORK_TYPE_HSPA;

import static android.telephony.TelephonyManager.NETWORK_TYPE_HSPAP;



import android.content.BroadcastReceiver;

import android.content.Context;
@@ -3261,6 +3262,10 @@ public class RIL extends BaseCommands implements CommandsInterface { 
       // Determine the radio access type

       String radioString = SystemProperties.get(

               TelephonyProperties.PROPERTY_DATA_NETWORK_TYPE, "unknown");

       if (radioString.contains(":")) {

           String[] parts = radioString.split(":");

           radioString = parts[0];

       }

       int radioType;

       if (radioString.equals("GPRS")) {

           radioType = NETWORK_TYPE_GPRS;
@@ -3274,6 +3279,8 @@ public class RIL extends BaseCommands implements CommandsInterface { 
           radioType = NETWORK_TYPE_HSUPA;

       } else if (radioString.equals("HSPA")) {

           radioType = NETWORK_TYPE_HSPA;

       } else if (radioString.equals("HSPAP")) {

           radioType = NETWORK_TYPE_HSPAP;

       } else {

           radioType = NETWORK_TYPE_UNKNOWN;

       }