OSDN -- Develop and Download Open Source Software

Android-x86
Fork
Donation

  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

frameworks-base: Commit

frameworks/base


Commit MetaInfo

Revision1b9f4b344512e0ce3d03f96c0f4b850c826a75b3 (tree)
Time2018-04-10 16:12:44
AuthorChih-Wei Huang <cwhuang@linu...>
CommiterChih-Wei Huang

Log Message

Android 8.1.0 release 22
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWsJ+8wAKCRDorT+BmrEO
eG5yAJ93xxQpF6xI2uiTVyVT3Zje2FSvFgCfXIls8c0HAotGMe8CxJ0Dl50KwGk=
=M4lz
-----END PGP SIGNATURE-----

Merge tag 'android-8.1.0_r22' into oreo-x86

Android 8.1.0 release 22

Change Summary

Incremental Difference

--- a/core/java/android/bluetooth/le/PeriodicAdvertisingReport.java
+++ b/core/java/android/bluetooth/le/PeriodicAdvertisingReport.java
@@ -71,7 +71,7 @@ public final class PeriodicAdvertisingReport implements Parcelable {
7171 @Override
7272 public void writeToParcel(Parcel dest, int flags) {
7373 dest.writeInt(syncHandle);
74- dest.writeLong(txPower);
74+ dest.writeInt(txPower);
7575 dest.writeInt(rssi);
7676 dest.writeInt(dataStatus);
7777 if (data != null) {
--- a/core/java/android/hardware/camera2/params/OutputConfiguration.java
+++ b/core/java/android/hardware/camera2/params/OutputConfiguration.java
@@ -409,6 +409,7 @@ public final class OutputConfiguration implements Parcelable {
409409 this.mConfiguredSize = other.mConfiguredSize;
410410 this.mConfiguredGenerationId = other.mConfiguredGenerationId;
411411 this.mIsDeferredConfig = other.mIsDeferredConfig;
412+ this.mIsShared = other.mIsShared;
412413 }
413414
414415 /**
@@ -421,6 +422,7 @@ public final class OutputConfiguration implements Parcelable {
421422 int width = source.readInt();
422423 int height = source.readInt();
423424 boolean isDeferred = source.readInt() == 1;
425+ boolean isShared = source.readInt() == 1;
424426 ArrayList<Surface> surfaces = new ArrayList<Surface>();
425427 source.readTypedList(surfaces, Surface.CREATOR);
426428
@@ -431,6 +433,7 @@ public final class OutputConfiguration implements Parcelable {
431433 mSurfaces = surfaces;
432434 mConfiguredSize = new Size(width, height);
433435 mIsDeferredConfig = isDeferred;
436+ mIsShared = isShared;
434437 mSurfaces = surfaces;
435438 if (mSurfaces.size() > 0) {
436439 mSurfaceType = SURFACE_TYPE_UNKNOWN;
--- a/core/java/android/net/Uri.java
+++ b/core/java/android/net/Uri.java
@@ -720,6 +720,10 @@ public abstract class Uri implements Parcelable, Comparable<Uri> {
720720 LOOP: while (end < length) {
721721 switch (uriString.charAt(end)) {
722722 case '/': // Start of path
723+ case '\\':// Start of path
724+ // Per http://url.spec.whatwg.org/#host-state, the \ character
725+ // is treated as if it were a / character when encountered in a
726+ // host
723727 case '?': // Start of query
724728 case '#': // Start of fragment
725729 break LOOP;
@@ -758,6 +762,10 @@ public abstract class Uri implements Parcelable, Comparable<Uri> {
758762 case '#': // Start of fragment
759763 return ""; // Empty path.
760764 case '/': // Start of path!
765+ case '\\':// Start of path!
766+ // Per http://url.spec.whatwg.org/#host-state, the \ character
767+ // is treated as if it were a / character when encountered in a
768+ // host
761769 break LOOP;
762770 }
763771 pathStart++;
--- a/core/java/com/android/internal/widget/VerifyCredentialResponse.java
+++ b/core/java/com/android/internal/widget/VerifyCredentialResponse.java
@@ -98,6 +98,8 @@ public final class VerifyCredentialResponse implements Parcelable {
9898 if (mPayload != null) {
9999 dest.writeInt(mPayload.length);
100100 dest.writeByteArray(mPayload);
101+ } else {
102+ dest.writeInt(0);
101103 }
102104 }
103105 }
--- a/core/tests/coretests/src/android/net/UriTest.java
+++ b/core/tests/coretests/src/android/net/UriTest.java
@@ -192,6 +192,12 @@ public class UriTest extends TestCase {
192192 assertEquals("a:a@example.com:a@example2.com", uri.getAuthority());
193193 assertEquals("example2.com", uri.getHost());
194194 assertEquals(-1, uri.getPort());
195+ assertEquals("/path", uri.getPath());
196+
197+ uri = Uri.parse("http://a.foo.com\\.example.com/path");
198+ assertEquals("a.foo.com", uri.getHost());
199+ assertEquals(-1, uri.getPort());
200+ assertEquals("\\.example.com/path", uri.getPath());
195201 }
196202
197203 @SmallTest
--- a/libs/androidfw/ResourceTypes.cpp
+++ b/libs/androidfw/ResourceTypes.cpp
@@ -813,7 +813,13 @@ const char* ResStringPool::string8At(size_t idx, size_t* outLen) const
813813 *outLen = encLen;
814814
815815 if ((uint32_t)(str+encLen-strings) < mStringPoolSize) {
816- return (const char*)str;
816+ // Reject malformed (non null-terminated) strings
817+ if (str[encLen] != 0x00) {
818+ ALOGW("Bad string block: string #%d is not null-terminated",
819+ (int)idx);
820+ return NULL;
821+ }
822+ return (const char*)str;
817823 } else {
818824 ALOGW("Bad string block: string #%d extends to %d, past end at %d\n",
819825 (int)idx, (int)(str+encLen-strings), (int)mStringPoolSize);
--- a/wifi/java/android/net/wifi/RttManager.java
+++ b/wifi/java/android/net/wifi/RttManager.java
@@ -847,8 +847,8 @@ public class RttManager {
847847 }
848848 dest.writeByte(result.LCR.id);
849849 if (result.LCR.id != (byte) 0xFF) {
850- dest.writeInt((byte) result.LCR.data.length);
851- dest.writeByte(result.LCR.id);
850+ dest.writeByte((byte) result.LCR.data.length);
851+ dest.writeByteArray(result.LCR.data);
852852 }
853853 dest.writeByte(result.secure ? (byte) 1 : 0);
854854 }
Show on old repository browser