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

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

Merge "core and telephony: Additional HSPAP support" into jellybean

parents 1c4bd2b2 55c992b9

core/java/android/os/BatteryStats.java

+3 −2
Original line number Diff line number Diff line
@@ -822,12 +822,13 @@ public abstract class BatteryStats implements Parcelable { 
    public static final int DATA_CONNECTION_EVDO_B = 12;

    public static final int DATA_CONNECTION_LTE = 13;

    public static final int DATA_CONNECTION_EHRPD = 14;

    public static final int DATA_CONNECTION_OTHER = 15;

    public static final int DATA_CONNECTION_HSPAP = 15;

    public static final int DATA_CONNECTION_OTHER = 16;



    static final String[] DATA_CONNECTION_NAMES = {

        "none", "gprs", "edge", "umts", "cdma", "evdo_0", "evdo_A",

        "1xrtt", "hsdpa", "hsupa", "hspa", "iden", "evdo_b", "lte",

        "ehrpd", "other"

        "ehrpd", "hspap", "other"

    };

    

    public static final int NUM_DATA_CONNECTION_TYPES = DATA_CONNECTION_OTHER+1;

core/java/com/android/internal/os/BatteryStatsImpl.java

+3 −0
Original line number Diff line number Diff line
@@ -1985,6 +1985,9 @@ public final class BatteryStatsImpl extends BatteryStats { 
                case TelephonyManager.NETWORK_TYPE_EHRPD:

                    bin = DATA_CONNECTION_EHRPD;

                    break;

                case TelephonyManager.NETWORK_TYPE_HSPAP:

                    bin = DATA_CONNECTION_HSPAP;

                    break;

                default:

                    bin = DATA_CONNECTION_OTHER;

                    break;

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

+3 −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;
@@ -3376,6 +3377,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;

       }