213061 Commits

Author SHA1 Message Date
Phil Burk
ec719f1509 Merge "USB MIDI: Fix race condition that causes intermittent connections."
am: 1c9bdfd029

* commit '1c9bdfd0294cd1b13470ae6443bfa2ad425bd7dd':
  USB MIDI: Fix race condition that causes intermittent connections.
2015-12-04 01:18:51 +00:00
Phil Burk
1c9bdfd029 Merge "USB MIDI: Fix race condition that causes intermittent connections." 2015-12-04 01:12:01 +00:00
Phil Burk
1852019c39 USB MIDI: Fix race condition that causes intermittent connections.
Plugging in a USB MIDI device normally works.
But occasionally the device is not seen due to a race condition.
This code retries until the device is ready.

Change-Id: Ifba9c9678e6be0c3d139f3467f895307096a2ad8
Signed-off-by: Phil Burk <philburk@google.com>
2015-12-03 17:00:42 -08:00
Jeff Sharkey
f2a3c341ab Merge "Allow customisation of advanced settings in DocumentsUI"
am: f1b325c1ec

* commit 'f1b325c1ec41c09f6efeb3d7709e7e7af93eacb8':
  Allow customisation of advanced settings in DocumentsUI
2015-12-03 23:11:51 +00:00
Jeff Sharkey
f1b325c1ec Merge "Allow customisation of advanced settings in DocumentsUI" 2015-12-03 23:04:29 +00:00
Edward Savage-Jones
827dec0e48 Allow customisation of advanced settings in DocumentsUI
Enables the customisation of the default value of the DocumentsUI
'advanced' setting using overlays.

Change-Id: I240cbb845d15ab2ea6ae7a79a17b4f51905fdb9c
2015-12-03 23:02:47 +00:00
Alex Klyubin
b1e7f6d287 Merge "Stop using 512 bit RSA keys in keyset unit tests."
am: 59c9bfd41b

* commit '59c9bfd41bfe7d897a1a5d2e35d8dd48322c9865':
  Stop using 512 bit RSA keys in keyset unit tests.
2015-12-03 21:18:38 +00:00
Alex Klyubin
59c9bfd41b Merge "Stop using 512 bit RSA keys in keyset unit tests." 2015-12-03 21:10:46 +00:00
Alex Klyubin
377e70ae9f Stop using 512 bit RSA keys in keyset unit tests.
This switches keyset unit tests from two unrealistically short 512 bit
RSA keys to a more realistic 2048 bit RSA key and a NIST P-256 EC key.

Change-Id: If615b97dff22a2a4f7f0e6015e410e98b8d395cd
2015-12-03 12:52:23 -08:00
Yohei Yukawa
30e321b54a Merge "Fix special handling of a fake language code "tl"."
am: 9fd2af6b32

* commit '9fd2af6b323ef98695701a8bcfdd3ca1c4dd7965':
  Fix special handling of a fake language code "tl".
2015-12-03 19:10:30 +00:00
Yohei Yukawa
9fd2af6b32 Merge "Fix special handling of a fake language code "tl"." 2015-12-03 19:04:24 +00:00
Christopher Wiley
4ff2cc0898 Merge "Map Errors.h\'s UNEXPECTED_NULL to NullPointerException"
am: 0ded0da517

* commit '0ded0da51743a24707bece4b0be05f49db3b9981':
  Map Errors.h's UNEXPECTED_NULL to NullPointerException
2015-12-03 17:46:58 +00:00
Christopher Wiley
0ded0da517 Merge "Map Errors.h's UNEXPECTED_NULL to NullPointerException" 2015-12-03 17:43:43 +00:00
Jeff Sharkey
aae0a49c16 Merge "Avoid a double decrease of reference counter for unstable provider"
am: e8651aed4b

* commit 'e8651aed4b8a2c6703589069e26f5be750b2a947':
  Avoid a double decrease of reference counter for unstable provider
2015-12-03 17:07:50 +00:00
Jeff Sharkey
67003be3f8 Merge branch 'stage-aosp-master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into stage-aosp-master 2015-12-03 17:06:57 +00:00
Jeff Sharkey
af588a31bc Merge "StrictMode: fix deserialization of ViolationInfo on large stacks"
am: 29e0b6e789

* commit '29e0b6e7891091614a9e9dd6083017d0c9d454ae':
  StrictMode: fix deserialization of ViolationInfo on large stacks
2015-12-03 17:06:24 +00:00
Jeff Sharkey
d5cefab28c Merge "StrictMode: fix deserialization of ViolationInfo on large stacks"
am: 29e0b6e789

* commit '29e0b6e7891091614a9e9dd6083017d0c9d454ae':
  StrictMode: fix deserialization of ViolationInfo on large stacks
2015-12-03 17:05:16 +00:00
Jeff Sharkey
678011854b Merge "Fix race condition when collecting op callback."
am: 98844a97d2

* commit '98844a97d2bd07146854783374ee3a19aed8edd5':
  Fix race condition when collecting op callback.
2015-12-03 17:03:53 +00:00
Jeff Sharkey
bc57510e9f Merge "Improved variable naming"
am: 4ef9d41066

* commit '4ef9d41066d8b4124c2c59752512adf24102634d':
  Improved variable naming
2015-12-03 17:02:21 +00:00
Jeff Sharkey
e8651aed4b Merge "Avoid a double decrease of reference counter for unstable provider" 2015-12-03 16:59:58 +00:00
Jeff Sharkey
29e0b6e789 Merge "StrictMode: fix deserialization of ViolationInfo on large stacks" 2015-12-03 16:59:13 +00:00
Jeff Sharkey
98844a97d2 Merge "Fix race condition when collecting op callback." 2015-12-03 16:58:34 +00:00
Jeff Sharkey
4ef9d41066 Merge "Improved variable naming" 2015-12-03 16:58:03 +00:00
Yohei Yukawa
ed65bc0c62 Fix special handling of a fake language code "tl".
My previous CL 92280cd309b0f5967dd253280962d8581844db89 [1] had a silly
mistake that "tl" is converted to "fil" but "tl_PH" is not.

  [1] I94f203bddceb9c87710cb187cc3cc0ee6d9092a5

With this CL, the compatibility rewrite-rule from "tl" to "fil" starts
working regardless of the existence of countly/variant subtags in locale
string.  So far the only affected platfrom is API Level 23.

Bug: 20696126
Change-Id: Ica9cd2baac002c406f92331aadd7725d7424046a
2015-12-02 18:22:41 -08:00
Colin Cross
38400b4696 Merge "Don\'t hardcode expected path to mainDexClasses"
am: be1613379e

* commit 'be1613379e4814e9c54901d6e0171841e68f60ab':
  Don't hardcode expected path to mainDexClasses
2015-12-03 01:19:28 +00:00
Colin Cross
be1613379e Merge "Don't hardcode expected path to mainDexClasses" 2015-12-03 01:12:05 +00:00
Colin Cross
b4ff8e4815 Don't hardcode expected path to mainDexClasses
Use MAINDEXCLASSES defined by the build system instead of manually using
$(HOST_OUT_EXECUTABLES)/mainDexClasses.

Change-Id: Iede13c243ef0c4e374c8e80bab4a995cea76b9b1
2015-12-02 16:24:08 -08:00
Robin Lee
427edbce96 Merge "DevicePolicy: Always send ACTION_PASSWORD_CHANGED"
am: 3fe5a65b1c

* commit '3fe5a65b1cc621d40f6278dd1e38d5ec58f92fb6':
  DevicePolicy: Always send ACTION_PASSWORD_CHANGED
2015-12-02 12:41:20 +00:00
Robin Lee
3fe5a65b1c Merge "DevicePolicy: Always send ACTION_PASSWORD_CHANGED" 2015-12-02 12:35:14 +00:00
Chad Brubaker
3c096b3a88 Merge "Expose findTrustAnchorBySubjectAndPublicKey"
am: 6fea66116c

* commit '6fea66116c79ecb5232a1c7ae66ae2a6e62c1c12':
  Expose findTrustAnchorBySubjectAndPublicKey
2015-12-01 20:21:35 +00:00
Chad Brubaker
a2388beca1 Merge "Make NetworkSecurityConfigProvider.install lazy"
am: 73c06b1dbe

* commit '73c06b1dbe08b3fc3786a3fab007f26398111f6a':
  Make NetworkSecurityConfigProvider.install lazy
2015-12-01 20:20:11 +00:00
Chad Brubaker
6fea66116c Merge "Expose findTrustAnchorBySubjectAndPublicKey" 2015-12-01 20:13:40 +00:00
Chad Brubaker
73c06b1dbe Merge "Make NetworkSecurityConfigProvider.install lazy" 2015-12-01 20:13:23 +00:00
Chad Brubaker
d3af962081 Expose findTrustAnchorBySubjectAndPublicKey
This allows for faster lookups of TrustAnchors when checking pin
overrides without needing to iterate over all certificates.

Currently only the system and user trusted certificate store are
optimized to avoid reading the entire source before doing the trust
anchor lookup, improvements to the resource source will come in a later
commit.

This also refactors System/UserCertificateSource to avoid code
duplication.

Change-Id: Ice00c5e047140f3d102306937556b761faaf0d0e
2015-11-30 17:20:00 -08:00
Chad Brubaker
59919babe0 Merge "Remove isCertificateEntry check"
am: 7d72975c5b

* commit '7d72975c5b3e6f18710f078199e7a9e3f9376c60':
  Remove isCertificateEntry check
2015-11-29 23:50:33 +00:00
Chad Brubaker
7d72975c5b Merge "Remove isCertificateEntry check" 2015-11-29 23:45:47 +00:00
Christopher Wiley
a94fc52437 Map Errors.h's UNEXPECTED_NULL to NullPointerException
Many native services reject null references with this status_t.
Map it to an appropriate exception for Java Binder clients.

Bug: 25615695
Change-Id: I16a4f44da35839892fc4d332f95382f06485b2a7
2015-11-28 14:25:35 -08:00
Chad Brubaker
9a0130865e Remove isCertificateEntry check
This was returning false on some test keystores even when
getCertificate would correct return a certificate. Remove the check to
be consistent with how conscrypt loads trust anchors from the keystore.

Bug: 25897324
Change-Id: Ie87658a261ee7ba1cca6896e34b6c53b8abfba85
2015-11-26 14:00:50 -08:00
Chad Brubaker
2075a3ebc0 Make NetworkSecurityConfigProvider.install lazy
This defers looking up the meta-data from the install call to when the
rest of the config is lazily initialized.

Change-Id: I008a86f885e158ebe06a2bacdc358cd217635d05
2015-11-25 13:15:59 -08:00
Chad Brubaker
a4a6cf9b51 Merge "Implement checkClientTrusted"
am: 8e19803a6a

* commit '8e19803a6a10ac44ca59cf15a2ae1f2eedb13cf8':
  Implement checkClientTrusted
2015-11-25 20:41:03 +00:00
Chad Brubaker
8e19803a6a Merge "Implement checkClientTrusted" 2015-11-25 20:33:31 +00:00
Chad Brubaker
bdd13f02bc Implement checkClientTrusted
Bug: 25885029
Change-Id: I07ef11a556f1a1a65456ae5e3904c56902c6e82a
2015-11-25 12:22:06 -08:00
Alex Klyubin
4bc1904119 Merge "Custom engineUpdate/engineDoFinal(ByteBuffer, ByteBuffer)."
am: e766e399c5

* commit 'e766e399c59669156284c330ae3f38f79230d930':
  Custom engineUpdate/engineDoFinal(ByteBuffer, ByteBuffer).
2015-11-25 19:05:09 +00:00
Alex Klyubin
e766e399c5 Merge "Custom engineUpdate/engineDoFinal(ByteBuffer, ByteBuffer)." 2015-11-25 18:59:35 +00:00
Yury Zhauniarovich
4fab7fbeb0 Improved variable naming
Variable name "appOpPerms" is substituted to "appOpPkgs", which is better
suited.

Change-Id: I038b93fdf5e539551c4aab12d9918c9937602e2d
Signed-off-by: Yury Zhauniarovich <y.zhalnerovich@gmail.com>
2015-11-25 17:53:20 +03:00
Alex Klyubin
d976c5a4ee Custom engineUpdate/engineDoFinal(ByteBuffer, ByteBuffer).
This makes Android Keystore's Cipher implementation use a custom
implementation of engineUpdate(ByteBuffer, ByteBuffer) and
engineDoFinal(ByteBuffer, ByteBuffer). The implementation is
explicitly designed around the fact that Android Keystore transmits
input and receives output via Binder and thus there's no need to
attempt any optimizations to avoid copying input and output.

Bug: 25863382
Change-Id: I311072891f02f5e7a283628b51b8d6058b55231c
2015-11-24 17:22:27 -08:00
Jim Kaye
e579edc76b Merge "Extend the \'qwerty\' key layout"
am: 9a83f115ad

* commit '9a83f115ade900a816f0fa2beae2cdd6f54bfc54':
  Extend the 'qwerty' key layout
2015-11-24 19:33:57 +00:00
Jim Kaye
9a83f115ad Merge "Extend the 'qwerty' key layout" 2015-11-24 19:27:46 +00:00
Sergio Giro
d9942006e4 Merge "ssl: make DistinguishedNameParser a package-private class in org.apache.http.conn.ssl"
am: d5a5d547d0

* commit 'd5a5d547d05eee9d626db1d7977c11acbf83b0c7':
  ssl: make DistinguishedNameParser a package-private class in org.apache.http.conn.ssl
2015-11-24 15:43:06 +00:00
Sergio Giro
d5a5d547d0 Merge "ssl: make DistinguishedNameParser a package-private class in org.apache.http.conn.ssl" 2015-11-24 11:14:24 +00:00