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

Commit bd9513f3 authored by Patrick Tjin's avatar Patrick Tjin Committed by Android (Google) Code Review
Browse files

Merge "Add HSPA+ to BatteryStats" into klp-dev

parents 6fe15c3d b71703cf

core/java/android/os/BatteryStats.java

+3 −2
Original line number Diff line number Diff line
@@ -844,12 +844,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
@@ -2172,6 +2172,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;