Merge cherrypicks of [3551537, 3552808, 3552809, 3551513, 3551514, 3554326,... (1e79675f) · 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
		@@ -192,6 +192,12 @@ public class UriTest extends TestCase {
		assertEquals("a:a@example.com:a@example2.com", uri.getAuthority());
		assertEquals("example2.com", uri.getHost());
		assertEquals(-1, uri.getPort());
		assertEquals("/path", uri.getPath());

		uri = Uri.parse("http://a.foo.com\\.example.com/path");
		assertEquals("a.foo.com", uri.getHost());
		assertEquals(-1, uri.getPort());
		assertEquals("\\.example.com/path", uri.getPath());
		}

		@SmallTest

+7 −1

Original line number	Diff line number	Diff line
		@@ -813,6 +813,12 @@ const char* ResStringPool::string8At(size_t idx, size_t* outLen) const
		*outLen = encLen;

		if ((uint32_t)(str+encLen-strings) < mStringPoolSize) {
		// Reject malformed (non null-terminated) strings
		if (str[encLen] != 0x00) {
		ALOGW("Bad string block: string #%d is not null-terminated",
		(int)idx);
		return NULL;
		}
		return (const char*)str;
		} else {
		ALOGW("Bad string block: string #%d extends to %d, past end at %d\n",