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

Commit 086d3414 authored by Abhisek Devkota's avatar Abhisek Devkota Committed by Gerrit Code Review
Browse files

Merge "frameworks/base: forward port DC-HSPAP support from cm-10" into cm-11.0

parents 4251a52c eed8a49d

core/java/android/net/MobileDataStateTracker.java

+5 −0
Original line number Diff line number Diff line
@@ -457,6 +457,9 @@ public class MobileDataStateTracker extends BaseNetworkStateTracker { 
        case TelephonyManager.NETWORK_TYPE_HSPAP:

            networkTypeStr = "hspap";

            break;

        case TelephonyManager.NETWORK_TYPE_DCHSPAP:

            networkTypeStr = "dchspap";

            break;

        case TelephonyManager.NETWORK_TYPE_CDMA:

            networkTypeStr = "cdma";

            break;
@@ -932,6 +935,7 @@ public class MobileDataStateTracker extends BaseNetworkStateTracker { 
            new NetworkDataEntry(TelephonyManager.NETWORK_TYPE_HSUPA,   14400,    5760, UNKNOWN),

            new NetworkDataEntry(TelephonyManager.NETWORK_TYPE_HSPA,    14400,    5760, UNKNOWN),

            new NetworkDataEntry(TelephonyManager.NETWORK_TYPE_HSPAP,   21000,    5760, UNKNOWN),

            new NetworkDataEntry(TelephonyManager.NETWORK_TYPE_DCHSPAP, 42000,    5760, UNKNOWN),

            new NetworkDataEntry(TelephonyManager.NETWORK_TYPE_CDMA,  UNKNOWN, UNKNOWN, UNKNOWN),

            new NetworkDataEntry(TelephonyManager.NETWORK_TYPE_1xRTT, UNKNOWN, UNKNOWN, UNKNOWN),

            new NetworkDataEntry(TelephonyManager.NETWORK_TYPE_EVDO_0,   2468,     153, UNKNOWN),
@@ -965,6 +969,7 @@ public class MobileDataStateTracker extends BaseNetworkStateTracker { 
            case TelephonyManager.NETWORK_TYPE_HSUPA:

            case TelephonyManager.NETWORK_TYPE_HSPA:

            case TelephonyManager.NETWORK_TYPE_HSPAP:

            case TelephonyManager.NETWORK_TYPE_DCHSPAP:

                level = ss.getGsmLevel();

                break;

            case TelephonyManager.NETWORK_TYPE_CDMA:

core/java/android/os/BatteryStats.java

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

    public static final int DATA_CONNECTION_EHRPD = 14;

    public static final int DATA_CONNECTION_HSPAP = 15;

    public static final int DATA_CONNECTION_OTHER = 16;

    public static final int DATA_CONNECTION_DCHSPAP = 16;

    public static final int DATA_CONNECTION_OTHER = 17;



    static final String[] DATA_CONNECTION_NAMES = {

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

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

        "ehrpd", "hspap", "other"

        "ehrpd", "hspa+","dc-hspa+", "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
@@ -2177,6 +2177,9 @@ public class BatteryStatsImpl extends BatteryStats { 
                case TelephonyManager.NETWORK_TYPE_HSPAP:

                    bin = DATA_CONNECTION_HSPAP;

                    break;

                case TelephonyManager.NETWORK_TYPE_DCHSPAP:

                    bin = DATA_CONNECTION_DCHSPAP;

                    break;

                default:

                    bin = DATA_CONNECTION_OTHER;

                    break;

packages/SystemUI/res/drawable-hdpi/ic_qs_signal_dc.png

0 → 100644
+17.1 KiB
Loading image diff...

packages/SystemUI/res/drawable-hdpi/ic_qs_signal_full_dc.png

0 → 100644
+17 KiB
Loading image diff...