Permalink
Switch branches/tags
Nothing to show
Commits on Jun 29, 2012
  1. merge in jb-release history after reset to jb-dev

    The Android Automerger committed Jun 29, 2012
  2. HttpEngine should not attempt to cache proxy CONNECT responses

    bdcgoogle committed Jun 29, 2012
    This fixes an issue where a bad proxy repsonse that included a body
    would turn into an IllegalStateException instead of an IOException.
    
    Bug: 6754912
    
    Change-Id: I204ad975820693d6add2780d7b77360463e33710
Commits on Jun 26, 2012
  1. merge in jb-release history after reset to jb-dev

    The Android Automerger committed Jun 26, 2012
Commits on Jun 24, 2012
  1. Fix OldAndroidZipStressTest for user builds

    Brian Muramatsu committed Jun 24, 2012
    The test was trying to create ZipFile instances with ODEX files and
    failing so add a FileNameFilter that only returns APK files.
    
    Bug 6721995
    
    Change-Id: Ifadcb993d37f7f08e4864c5ce5e8dc4ed7d439fb
Commits on May 30, 2012
  1. merge in jb-release history after reset to jb-dev

    The Android Automerger committed May 30, 2012
Commits on May 28, 2012
  1. Change OpenSSLSocketImpl to forbid empty lists of NPN protocols.

    Jesse Wilson committed with Android (Google) Code Review May 17, 2012
    Change-Id: I65d5d7b8d69ddfd551cbbe6da063f5ac277c5f45
Commits on May 22, 2012
  1. merge in jb-release history after reset to jb-dev

    The Android Automerger committed May 22, 2012
Commits on May 21, 2012
  1. Revert "Revert "Cut down on object allocation in CipherInputStream""

    bdcgoogle committed May 21, 2012
    This reverts commit 6b3f949.
    
    Bug: 6523748
    Bug: 6478569
    Change-Id: Ic422e5fa320995600bdae7a42816652e16b8728b
  2. Revert "Cut down on object allocation in CipherInputStream"

    bdcgoogle committed with The Android Automerger May 21, 2012
    This reverts commit 4dda1fc.
  3. Revert "Cut down on object allocation in CipherInputStream"

    bdcgoogle committed May 21, 2012
    This reverts commit 4dda1fc.
Commits on May 20, 2012
  1. merge in jb-release history after reset to jb-dev

    The Android Automerger committed May 20, 2012
Commits on May 18, 2012
  1. Cut down on object allocation in CipherInputStream

    bdcgoogle committed May 17, 2012
    Bug: 6478569
    Change-Id: I214a9b701d9fbe71be3681298d8c49172bc2f85f
Commits on May 17, 2012
  1. merge in jb-release history after reset to jb-dev

    The Android Automerger committed May 17, 2012
  2. Merge "AssertionError(Object) should only initCause if the object is …

    enh committed with Android (Google) Code Review May 17, 2012
    …a Throwable." into jb-dev
  3. AssertionError(Object) should only initCause if the object is a Throw…

    enh committed May 15, 2012
    …able.
    
    Bug: http://code.google.com/p/android/issues/detail?id=29378
    
    (cherry picked from commit f3d0739)
    
    Change-Id: I43bd0adad010348004376606335f947d0b8cb912
  4. Fix BitSet.nextClearBit.

    enh committed May 15, 2012
    Bug: http://code.google.com/p/android/issues/detail?id=31036
    
    (cherry picked from commit 431d246)
    
    Change-Id: If5acc7bbfdba12d98b8a6ef02b887eafa29cb2d8
Commits on May 16, 2012
  1. Merge "Only use SSL CUTTHROUGH (False Start) if the server supports N…

    Jesse Wilson committed with Android (Google) Code Review May 16, 2012
    …PN." into jb-dev
Commits on May 15, 2012
  1. Only use SSL CUTTHROUGH (False Start) if the server supports NPN.

    Jesse Wilson committed May 11, 2012
    We enable cutthrough on the client if the server supports NPN.
    We never enable cutthrough on the server because most relevant
    protocols (ie. HTTP) are client-speaks-first and those don't
    benefit from cutthrough on the server.
    
    I verified this by enabling NPN on both client and server and
    checking that the client's Application Data was sent before the
    server's Change Cipher Spec. To increase the likelihood of this
    otherwise racy situation I put the server in SSL debug mode
    after it receiving next_protos_advertised_callback. OpenSSL's
    debug mode adds a 1-second sleep before each read and write.
    
    Bug: http://b/6331035
    
    Change-Id: I879b5fb26dc237392a36fe0585c8a6519c0e5220
Commits on May 14, 2012
  1. merge in jb-release history after reset to jb-dev

    The Android Automerger committed May 14, 2012
Commits on May 11, 2012
  1. Work around poll(2) failing with EINTR.

    enh committed May 11, 2012
    This restores the gingerbread behavior, which is arguably pretty annoying too,
    but it's what we've always done so less likely to be disruptive.
    
    Bug: 6453247
    Change-Id: I22635e36a37cb36cf2b22d1739ab6a28662c9188
  2. Merge "Added tests for the CertBlacklister." into jb-dev

    gcondra committed with Android (Google) Code Review May 11, 2012
  3. Added tests for the CertBlacklister.

    gcondra committed May 10, 2012
    Change-Id: I56f80e52b5974a6953e89d54d84f020d41117b2a
Commits on May 10, 2012
  1. Merge "Use weasel words to cover changed behavior around END_DOCUMENT…

    Jesse Wilson committed with Android (Google) Code Review May 10, 2012
    …." into jb-dev
  2. Use weasel words to cover changed behavior around END_DOCUMENT.

    Jesse Wilson committed May 10, 2012
    We used to have 2 different implementations of XmlPullParser and
    each of them behaved differently if you called next() after
    receiving the END_DOCUMENT token:
     - Parsers returned from XmlPullParserFactory didn't throw
     - Parsers returned from android.util.Xml did throw
    
    When we went to a single implementation the behavior changed for
    android.util.Xml users. Unfortunately the change went from being
    consistent-with-the-docs to not. Rather than changing the behavior
    I'm being a weasel and changing the docs! That way we aren't
    promising something we cannot deliver.
    
    Bug: http://code.google.com/p/android/issues/detail?id=29931
    Change-Id: I0e72e79270b92ecc0fdb5bf64c97fa50d2bdb81c
  3. CA certificate update: EC-ACC

    bdcgoogle committed May 10, 2012
    Added    SHA1      : 28:90:3A:63:5B:52:80:FA:E6:77:4C:0B:6D:A7:D6:BA:A6:4A:F2:E8
             Subject   : C=ES, O=Agencia Catalana de Certificacio (NIF Q-0801176-I), OU=Serveis Publics de Certificacio, OU=Vegeu https://www.catcert.net/verarrel (c)03, OU=Jerarquia Entitats de Certificacio Catalanes, CN=EC-ACC
    
    Bug: 6451021
    Change-Id: I8b2ce4a5d907200c968fb98ab0ecad6f66f99b26
  4. merge in jb-release history after reset to jb-dev

    The Android Automerger committed May 10, 2012
Commits on May 9, 2012
  1. Merge "javax.net.ssl javadoc cleanup" into jb-dev

    bdcgoogle committed with Android (Google) Code Review May 9, 2012
  2. javax.net.ssl javadoc cleanup

    bdcgoogle committed May 9, 2012
    Change-Id: I8b64831a5f0a160c167eaf3e4bf2dd81fe265f5f
  3. Fix FileTest#test_getCanonicalPath

    Brian Muramatsu committed May 9, 2012
    Bug 6333447
    
    The test is failing since the path to SD card has changed from
    /mnt/sdcard/test1.txt to /storage/sdcard0/test1.txt. Remove the
    check since Android devices won't necessarily point to
    /storage/sdcard0 just like how this wasn't the case for
    /mnt/sdcard.
    
    Change-Id: Iee1cdd9e791eb13136411054d8ebc0e9d4f9401a
Commits on May 8, 2012
  1. merge in jb-release history after reset to jb-dev

    The Android Automerger committed May 8, 2012
Commits on May 7, 2012
  1. Merge "Provide key context" into jb-dev

    Selim Gurun committed with Android (Google) Code Review May 7, 2012
Commits on May 6, 2012
  1. merge in jb-release history after reset to jb-dev

    The Android Automerger committed May 6, 2012
Commits on May 4, 2012
  1. Make libjavacore independent of libnativehelper for the PDK.

    enh committed May 4, 2012
    Bug: 6369821
    Change-Id: Ie038571a5dac1f301c0c3c6fb84df432e67b62c0
  2. Provide key context

    Selim Gurun committed May 1, 2012
    Bug: 6249185
    
    Make the key context available.
    
    Change-Id: I51967e2a164b3f83d5d5096add7199c3a121da06
Commits on May 2, 2012
  1. merge in jb-release history after reset to jb-dev

    The Android Automerger committed May 2, 2012