Merge tag 'android-8.1.0_r20' into lineage-15.1 (a275e416) · Commits · e / os / android_frameworks_base

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) {

+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;

+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++;

+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>

+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;