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

Commit 30e398d7 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [4986743, 4986744, 4987539, 4987168, 4986376, 4986377,... 

Merge cherrypicks of [4986743, 4986744, 4987539, 4987168, 4986376, 4986377, 4986378, 4986889, 4986745, 4986746, 4986747, 4986748, 4986749, 4986750, 4986773, 4987169, 4987170, 4987611, 4987631, 4987632, 4987633, 4987634, 4986890, 4987612, 4987651, 4987598, 4987613, 4987614, 4987615, 4987599, 4986379, 4986380, 4987652, 4987653, 4987691, 4986774] into pi-qpr1-release

Change-Id: Idfec2f26918d14afde9ef01367ffb1ecd1dde548
parents 706f708d 6a947f04

core/java/android/os/Parcel.java

+9 −1
Original line number Diff line number Diff line
@@ -835,11 +835,19 @@ public final class Parcel { 
            return;

        }

        Set<Map.Entry<String,Object>> entries = val.entrySet();

        writeInt(entries.size());

        int size = entries.size();

        writeInt(size);



        for (Map.Entry<String,Object> e : entries) {

            writeValue(e.getKey());

            writeValue(e.getValue());

            size--;

        }



        if (size != 0) {

            throw new BadParcelableException("Map size does not match number of entries!");

        }



    }



    /**

core/java/android/os/StatsLogEventWrapper.java

+8 −13
Original line number Diff line number Diff line
@@ -65,11 +65,17 @@ public final class StatsLogEventWrapper implements Parcelable { 
    public static final Parcelable.Creator<StatsLogEventWrapper> CREATOR = new

            Parcelable.Creator<StatsLogEventWrapper>() {

                public StatsLogEventWrapper createFromParcel(Parcel in) {

                    return new StatsLogEventWrapper(in);

                    android.util.EventLog.writeEvent(0x534e4554, "112550251",

                            android.os.Binder.getCallingUid(), "");

                    // Purposefully leaving this method not implemented.

                    throw new RuntimeException("Not implemented");

                }



                public StatsLogEventWrapper[] newArray(int size) {

                    return new StatsLogEventWrapper[size];

                    android.util.EventLog.writeEvent(0x534e4554, "112550251",

                            android.os.Binder.getCallingUid(), "");

                    // Purposefully leaving this method not implemented.

                    throw new RuntimeException("Not implemented");

                }

            };
@@ -120,10 +126,6 @@ public final class StatsLogEventWrapper implements Parcelable { 
        mStorage.write(bytes, 0, bytes.length);

    }



    private StatsLogEventWrapper(Parcel in) {

        readFromParcel(in);

    }



    /**

     * Writes the stored fields to a byte array. Will first write a new-line character to denote

     * END_LIST before writing contents to byte array.
@@ -133,13 +135,6 @@ public final class StatsLogEventWrapper implements Parcelable { 
        out.writeByteArray(mStorage.toByteArray());

    }



    /**

     * Not implemented.

     */

    public void readFromParcel(Parcel in) {

        // Not needed since this java class is for sending to statsd only.

    }



    /**

     * Boilerplate for Parcel.

     */

core/res/res/values-mcc302-mnc220/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
        <item>SUPL_PORT=7275</item>

        <item>SUPL_VER=0x20000</item>

        <item>SUPL_MODE=1</item>

        <item>SUPL_ES=0</item>

        <item>SUPL_ES=1</item>

        <item>LPP_PROFILE=3</item>

        <item>USE_EMERGENCY_PDN_FOR_EMERGENCY_SUPL=1</item>

        <item>A_GLONASS_POS_PROTOCOL_SELECT=0</item>

core/res/res/values-mcc302-mnc221/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
        <item>SUPL_PORT=7275</item>

        <item>SUPL_VER=0x20000</item>

        <item>SUPL_MODE=1</item>

        <item>SUPL_ES=0</item>

        <item>SUPL_ES=1</item>

        <item>LPP_PROFILE=3</item>

        <item>USE_EMERGENCY_PDN_FOR_EMERGENCY_SUPL=1</item>

        <item>A_GLONASS_POS_PROTOCOL_SELECT=0</item>

core/res/res/values-mcc302-mnc370/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
        <item>SUPL_PORT=7275</item>

        <item>SUPL_VER=0x20000</item>

        <item>SUPL_MODE=1</item>

        <item>SUPL_ES=0</item>

        <item>SUPL_ES=1</item>

        <item>LPP_PROFILE=2</item>

        <item>USE_EMERGENCY_PDN_FOR_EMERGENCY_SUPL=1</item>

        <item>A_GLONASS_POS_PROTOCOL_SELECT=0</item>