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

Commit 2963cd41 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [3581037, 3581038, 3580473, 3580624, 3580656, 3580657,... 

Merge cherrypicks of [3581037, 3581038, 3580473, 3580624, 3580656, 3580657, 3580658, 3580382, 3580474, 3580475, 3581039, 3581040, 3580476, 3580206, 3581527, 3580955, 3580956, 3580957, 3580958, 3580959, 3580960, 3580961, 3580962, 3580963, 3580964, 3580965, 3580966, 3581567, 3581568, 3581569, 3581570, 3581571, 3580625, 3580626, 3581587, 3581513, 3581514, 3581515, 3580477, 3581588, 3580659, 3580660, 3580383, 3580384, 3580478, 3580719, 3580479, 3580480, 3581385, 3581528, 3581041, 3581042, 3581043, 3581044, 3581045, 3581046, 3581607, 3580385, 3580481, 3580482, 3580483, 3580661, 3580662, 3580663, 3580664, 3580665, 3580484, 3580485, 3581608, 3581609, 3581610, 3581611, 3581612, 3581589, 3581613, 3580486, 3581519, 3581627, 3581628, 3581529, 3581530, 3581531, 3581629, 3581630] into oc-mr1-release

Change-Id: I107552246742f7f284efd431d810a44d97a223b1
parents 68505b31 5a3d2708

core/java/android/bluetooth/le/PeriodicAdvertisingReport.java

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ public final class PeriodicAdvertisingReport implements Parcelable { 
    @Override

    public void writeToParcel(Parcel dest, int flags) {

        dest.writeInt(syncHandle);

        dest.writeLong(txPower);

        dest.writeInt(txPower);

        dest.writeInt(rssi);

        dest.writeInt(dataStatus);

        if (data != null) {

core/java/android/hardware/camera2/params/OutputConfiguration.java

+3 −0
Original line number Diff line number Diff line
@@ -409,6 +409,7 @@ public final class OutputConfiguration implements Parcelable { 
        this.mConfiguredSize = other.mConfiguredSize;

        this.mConfiguredGenerationId = other.mConfiguredGenerationId;

        this.mIsDeferredConfig = other.mIsDeferredConfig;

        this.mIsShared = other.mIsShared;

    }



    /**
@@ -421,6 +422,7 @@ public final class OutputConfiguration implements Parcelable { 
        int width = source.readInt();

        int height = source.readInt();

        boolean isDeferred = source.readInt() == 1;

        boolean isShared = source.readInt() == 1;

        ArrayList<Surface> surfaces = new ArrayList<Surface>();

        source.readTypedList(surfaces, Surface.CREATOR);
@@ -431,6 +433,7 @@ public final class OutputConfiguration implements Parcelable { 
        mSurfaces = surfaces;

        mConfiguredSize = new Size(width, height);

        mIsDeferredConfig = isDeferred;

        mIsShared = isShared;

        mSurfaces = surfaces;

        if (mSurfaces.size() > 0) {

            mSurfaceType = SURFACE_TYPE_UNKNOWN;

core/java/android/net/Uri.java

+8 −0
Original line number Diff line number Diff line
@@ -720,6 +720,10 @@ public abstract class Uri implements Parcelable, Comparable<Uri> { 
                LOOP: while (end < length) {

                    switch (uriString.charAt(end)) {

                        case '/': // Start of path

                        case '\\':// Start of path

                          // Per http://url.spec.whatwg.org/#host-state, the \ character

                          // is treated as if it were a / character when encountered in a

                          // host

                        case '?': // Start of query

                        case '#': // Start of fragment

                            break LOOP;
@@ -758,6 +762,10 @@ public abstract class Uri implements Parcelable, Comparable<Uri> { 
                        case '#': // Start of fragment

                            return ""; // Empty path.

                        case '/': // Start of path!

                        case '\\':// Start of path!

                          // Per http://url.spec.whatwg.org/#host-state, the \ character

                          // is treated as if it were a / character when encountered in a

                          // host

                            break LOOP;

                    }

                    pathStart++;

core/java/android/provider/CallLog.java

+6 −0
Original line number Diff line number Diff line
@@ -223,6 +223,12 @@ public class CallLog { 
        /** Call was WIFI call. */

        public static final int FEATURES_WIFI = 0x8;



        /**

         * Indicates the call underwent Assisted Dialing.

         * @hide

         */

        public static final Integer FEATURES_ASSISTED_DIALING_USED = 0x10;



        /**

         * The phone number as the user entered it.

         * <P>Type: TEXT</P>

core/java/com/android/internal/colorextraction/types/Tonal.java

+5 −3
Original line number Diff line number Diff line
@@ -51,9 +51,11 @@ public class Tonal implements ExtractionType { 


    private static final boolean DEBUG = true;



    public static final int THRESHOLD_COLOR_LIGHT = 0xffe0e0e0;

    public static final int MAIN_COLOR_LIGHT = 0xffe0e0e0;

    public static final int SECONDARY_COLOR_LIGHT = 0xff9e9e9e;

    public static final int MAIN_COLOR_DARK = 0xff212121;

    public static final int THRESHOLD_COLOR_DARK = 0xff212121;

    public static final int MAIN_COLOR_DARK = 0xff000000;

    public static final int SECONDARY_COLOR_DARK = 0xff000000;



    private final TonalPalette mGreyPalette;
@@ -197,12 +199,12 @@ public class Tonal implements ExtractionType { 
        // light fallback or darker than our dark fallback.

        ColorUtils.colorToHSL(mainColor, mTmpHSL);

        final float mainLuminosity = mTmpHSL[2];

        ColorUtils.colorToHSL(MAIN_COLOR_LIGHT, mTmpHSL);

        ColorUtils.colorToHSL(THRESHOLD_COLOR_LIGHT, mTmpHSL);

        final float lightLuminosity = mTmpHSL[2];

        if (mainLuminosity > lightLuminosity) {

            return false;

        }

        ColorUtils.colorToHSL(MAIN_COLOR_DARK, mTmpHSL);

        ColorUtils.colorToHSL(THRESHOLD_COLOR_DARK, mTmpHSL);

        final float darkLuminosity = mTmpHSL[2];

        if (mainLuminosity < darkLuminosity) {

            return false;