Merge "Assert static key ECDH disallowed in default cipher suites."
am 36ec9fed: Merge "Assert static key ECDH disallowed in default cipher suites."

* commit '36ec9fedf1c6b4c45a15afab716e59c8a7509d2c':
  Assert static key ECDH disallowed in default cipher suites.
Actually prefer Forward Secrecy cipher suites.

The documentation for the list of TLS/SSL cipher suites used by
default states that cipher suites offering Forward Secrecy are
preferred. This CL adjusts the list to conform: FS cipher suites
that use RC4_128 bulk encryption algorithm were not preferred
over non-FS cipher suites that use AES.

Bug: 11220570
Change-Id: Ic9019306898600086920874474764186b710c3ef
Add registerAppInfo to the VMRuntime object

This adds the native function registerAppInfo() to the VMRuntime
object. It is called by the ActivityThread in the framework
to tell the runtime about application info.

Bug: 11539952
Change-Id: I3958a40af5afd513f943093fb483885c2b6b119e
Merge "Actually prefer Forward Secrecy cipher suites."
am 8a2af60c: Merge "Actually prefer Forward Secrecy cipher suites."

* commit '8a2af60ceb938a10ac59e93556133598bcdcbc7a':
  Actually prefer Forward Secrecy cipher suites.
Make DeflaterInputStream#available more consistent.

- We now guarantee that available() returns 0 iff.
  deflater.finished() == true. Note that this is still
  inconsistent with the specification of InputStream#available.

- Remove an unnecessary array copy in DeflaterInputStream#read.

- Remove tests that expect an IllegalArgumentException for
  negative skip count values. The InputStream spec doesn't mandate
  that we must throw here, and it's better to be consistent with
  every othem InputStream specialization in the code.

- Remove obsolete failures from brokentests.txt.

bug: 12189307

Change-Id: Ie9b1ad5d7c050b005b5f6f44a5a283bfdaeb1e81
Merge "Make DeflaterInputStream#available more consistent."
Fix a brain dead mistake in DeflaterInputStreamTest.

Removal of debug code gone bad.

Change-Id: I93d9decbd9d733cbeccd7832fef6857cf1b41b25
Merge "Fix a brain dead mistake in DeflaterInputStreamTest."
am 49009cd3: Merge "Make DeflaterInputStream#available more consistent."

* commit '49009cd31c5108ad52e372ffd7413fd416b1cd24':
  Make DeflaterInputStream#available more consistent.
am ed0bf204: Merge "Fix a brain dead mistake in DeflaterInputStreamTest."

* commit 'ed0bf204ead673837c96a334127667967e281edf':
  Fix a brain dead mistake in DeflaterInputStreamTest.
Fix broken assumption in a unit test.

Change-Id: I15c25ff373b1ca4acb5e530f75d028b971779549
Merge "Fix broken assumption in a unit test."
Fix broken test cases in DeflaterTest & InflaterTest

We explicitly disallow setLevel or setStrategy after
setInput. (It's clearly documented in the method docs).
Presumably, this is to prevent users from shooting
themselves in the foot & causing issues by changing
the strategy / level after we've started deflating.

Change-Id: Ifd65728ff0ec7e47aeec716aeb6f44242573c491
am 19de2cab: Merge "Fix broken assumption in a unit test."

* commit '19de2cab2d5dcfeda16aa9d67e058c8646414330':
  Fix broken assumption in a unit test.
Merge "Fix broken test cases in DeflaterTest & InflaterTest"
am 3b94868d: Merge "Fix broken test cases in DeflaterTest & InflaterTest"

* commit '3b94868dd195da3c54e0d421927e13ee87dc82be':
  Fix broken test cases in DeflaterTest & InflaterTest
Fix test breakages due to TLSv1.2 enabled and FS preferred.

Bug: 11220570
Change-Id: Ic918e806ae1d8ea9b98c690cfabd9c3245886525
Merge "Fix test breakages due to TLSv1.2 enabled and FS preferred."