OSDN Git Service
Chad Brubaker [Fri, 11 Dec 2015 18:02:34 +0000 (18:02 +0000)]
Merge "Add null check to getConfigForHostname"
Chad Brubaker [Fri, 11 Dec 2015 02:12:59 +0000 (18:12 -0800)]
Add null check to getConfigForHostname
bug:
26144676
Change-Id: I18f50940846f1ce8109560c63ce2a87ce084d9e5
Matthew Williams [Thu, 10 Dec 2015 18:04:44 +0000 (18:04 +0000)]
Merge "ConcurrentModificationException in SyncManager"
Eino-Ville Talvala [Wed, 9 Dec 2015 21:14:21 +0000 (21:14 +0000)]
Merge "Replace hard-coded errno values with OsConstants"
Chad Brubaker [Wed, 9 Dec 2015 20:53:01 +0000 (20:53 +0000)]
Merge "Use a custom TrustedCertificateStore"
Chad Brubaker [Wed, 9 Dec 2015 20:52:50 +0000 (20:52 +0000)]
Merge "Expose findByIssuerAndSignature"
Chad Brubaker [Wed, 9 Dec 2015 18:40:55 +0000 (18:40 +0000)]
Merge "Refactor NetworkSecurityPolicy to be pluggable"
Christopher Wiley [Tue, 8 Dec 2015 23:15:52 +0000 (23:15 +0000)]
Merge "Rethrow remote's ServiceSpecificException"
Chad Brubaker [Tue, 8 Dec 2015 21:37:28 +0000 (13:37 -0800)]
Refactor NetworkSecurityPolicy to be pluggable
This allows us to keep the logic for the NetworkSecurityPolicy in the
framework instead of in libcore.
Change-Id: I4bf494f79c27729cb17d93d90a91319492270ce9
Paul Duffin [Tue, 8 Dec 2015 14:11:45 +0000 (14:11 +0000)]
Merge "Remove framework from LOCAL_JAVA_LIBRARIES"
am:
e252149ab9
* commit '
e252149ab99a008a0a75734326755cadd5c5ee7a':
Remove framework from LOCAL_JAVA_LIBRARIES
Paul Duffin [Tue, 8 Dec 2015 14:10:09 +0000 (14:10 +0000)]
Merge "Follow-up to Switch to the latest version of Caliper"
am:
80d5bef6f9
* commit '
80d5bef6f9da4a0eeb23c3356843351170553df6':
Follow-up to Switch to the latest version of Caliper
Paul Duffin [Tue, 8 Dec 2015 14:04:29 +0000 (14:04 +0000)]
Merge "Remove framework from LOCAL_JAVA_LIBRARIES"
Paul Duffin [Tue, 8 Dec 2015 14:03:10 +0000 (14:03 +0000)]
Merge "Follow-up to Switch to the latest version of Caliper"
Paul Duffin [Tue, 8 Dec 2015 13:51:27 +0000 (13:51 +0000)]
Remove framework from LOCAL_JAVA_LIBRARIES
After previous change removed LOCAL_NO_STANDARD_LIBRARIES:=true
it is no longer necessary to explicitly add framework to
LOCAL_JAVA_LIBRARIES as it is added automatically by the build.
Change-Id: I68bf700375e34a10302f76d7463110755b815f85
Andreas Gampe [Tue, 8 Dec 2015 02:24:08 +0000 (18:24 -0800)]
Follow-up to Switch to the latest version of Caliper
Remove LOCAL_NO_STANDARD_LIBRARIES.
(cherry pick from commit
c9d6a91cd51a9b7ff00187914fe922b0d22b3d66)
Bug:
24848946
Change-Id: I19feea042c9b4823d4979f4d951476792600edbc
振淦王 [Tue, 1 Dec 2015 08:37:31 +0000 (16:37 +0800)]
ConcurrentModificationException in SyncManager
updateRunningAccounts and dispatchSyncOperation is running in different thread,
and mActiveSyncContexts not synchronization.
If methods occur together,
mActiveSyncContexts change may occur when cycle is running.
Sample:
https://code.google.com/p/android/issues/detail?id=195341
Solution:
Offboard the traversal from the main thread to the handler thread.
Change-Id: Ifb9fbb466a5087186be31f7877c50b8c8b6737e4
Signed-off-by: wangzhengan <wangzglx@gmail.com>
Neil Fuller [Tue, 8 Dec 2015 10:47:59 +0000 (10:47 +0000)]
Merge "Add ICU4J APIs for Android"
am:
cb02371ca7
* commit '
cb02371ca70a81796c75bd3bbf88478caf6ea7b7':
Add ICU4J APIs for Android
Neil Fuller [Tue, 8 Dec 2015 10:42:51 +0000 (10:42 +0000)]
Merge "Add ICU4J APIs for Android"
Michael Wright [Mon, 7 Dec 2015 23:19:53 +0000 (23:19 +0000)]
Merge "Add support for locking the screen when the lid is closed"
am:
9dc3c36c9c
* commit '
9dc3c36c9cd796d90b65543567495d910d266e4c':
Add support for locking the screen when the lid is closed
Samuel Tan [Mon, 7 Dec 2015 23:15:15 +0000 (23:15 +0000)]
Merge "Add support for reading and writing double array values"
am:
61c0b7cd4d
* commit '
61c0b7cd4d73381a2f4e3d3836389b130b5006d9':
Add support for reading and writing double array values
Paul Duffin [Mon, 7 Dec 2015 23:12:48 +0000 (23:12 +0000)]
Merge "Switch to the latest version of Caliper"
am:
ae119af517
* commit '
ae119af517fc427ead5bd6a3394b3b1f92df790d':
Switch to the latest version of Caliper
Michael Wright [Mon, 7 Dec 2015 21:34:59 +0000 (21:34 +0000)]
Merge "Add support for locking the screen when the lid is closed"
Samuel Tan [Mon, 7 Dec 2015 18:56:01 +0000 (18:56 +0000)]
Merge "Add support for reading and writing double array values"
Neil Fuller [Tue, 10 Nov 2015 13:14:07 +0000 (13:14 +0000)]
Add ICU4J APIs for Android
Add the planned set of new I18N public APIs for
Android N.
This APIs consists of a whitelisted subset of ICU4J APIs
repackaged under android.icu (not com.ibm.icu).
It includes no deprecated, provisional, internal methods from
ICU 56.
There may be future work to improve the ICU4J JavaDoc text
for Android, but the API surface area should be mostly
stable at this point.
Bug:
22023363
(cherry-picked from commit
d7fa3e79f071696bd62182c01b62fe0ea1cc9587)
Change-Id: I6667acbbf7c5501e12ecfbdd560ea80283c0c831
Paul Duffin [Mon, 7 Dec 2015 13:34:27 +0000 (13:34 +0000)]
Merge "Switch to the latest version of Caliper"
Paul Duffin [Tue, 1 Dec 2015 15:41:36 +0000 (15:41 +0000)]
Switch to the latest version of Caliper
Added an Android.mk file to core/tests/benchmarks to build the
benchmarks against caliper-api-target to ensure that they build
correctly. Changed the implementations to work with the new
version of Caliper.
Bug:
24848946
Change-Id: Ib28026816dbc5c1d54f65974f4a1abfee299c43f
Elliott Hughes [Sat, 5 Dec 2015 01:36:53 +0000 (01:36 +0000)]
Merge "Track rename from base/ to android-base/."
am:
9f6a2ae67c
* commit '
9f6a2ae67c70085d550962829e6bfe76706907d8':
Track rename from base/ to android-base/.
Elliott Hughes [Sat, 5 Dec 2015 01:30:46 +0000 (01:30 +0000)]
Merge "Track rename from base/ to android-base/."
Christopher Wiley [Mon, 23 Nov 2015 01:12:37 +0000 (17:12 -0800)]
Rethrow remote's ServiceSpecificException
Certain system services would like to throw exceptions
with specific error codes, so that the framework can catch
these specific conditions and express them appropriately.
Bug:
25800533
Change-Id: I94b3d30fa131f5e14bba893c971615840085459f
Elliott Hughes [Fri, 4 Dec 2015 23:33:35 +0000 (15:33 -0800)]
Track rename from base/ to android-base/.
Change-Id: I31be831de812052d1c0d4c0781178d0756124bcf
Edward Savage-Jones [Fri, 13 Nov 2015 12:27:03 +0000 (13:27 +0100)]
Add support for locking the screen when the lid is closed
This commit adds configurable support for lockscreen
behaviour when the user has a device cover/lid. This
is intended for lids with a viewing window so that the
user can see the time and interact with apps via the
window.
Change-Id: Id71883f66d1a180c4732912b3b59cabf9f4d7b6e
Lazar Trsic [Tue, 7 Jul 2015 15:31:20 +0000 (17:31 +0200)]
Replace hard-coded errno values with OsConstants
Errno values have been hard-coded inside java code. On the native side
however, bionic's errno.h is used (through utils/Errors.h). Some of
the numbers are architecture dependent (EOPNOTSUPP, ETIMEDOUT...).
This causes Camera app to crash on MIPS devices. There is a check for
expected errors, in CameraBinderDecorator.throwOnError, but the error
(EOPNOTSUPP) is not recognized and an exception is thrown.
Change-Id: I8bcac8f1ced50c76614f566a6e624967a18a25e1
Phil Burk [Fri, 4 Dec 2015 01:18:51 +0000 (01:18 +0000)]
Merge "USB MIDI: Fix race condition that causes intermittent connections."
am:
1c9bdfd029
* commit '
1c9bdfd0294cd1b13470ae6443bfa2ad425bd7dd':
USB MIDI: Fix race condition that causes intermittent connections.
Phil Burk [Fri, 4 Dec 2015 01:12:01 +0000 (01:12 +0000)]
Merge "USB MIDI: Fix race condition that causes intermittent connections."
Phil Burk [Fri, 4 Dec 2015 01:00:42 +0000 (17:00 -0800)]
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>
Jeff Sharkey [Thu, 3 Dec 2015 23:11:51 +0000 (23:11 +0000)]
Merge "Allow customisation of advanced settings in DocumentsUI"
am:
f1b325c1ec
* commit '
f1b325c1ec41c09f6efeb3d7709e7e7af93eacb8':
Allow customisation of advanced settings in DocumentsUI
Jeff Sharkey [Thu, 3 Dec 2015 23:04:29 +0000 (23:04 +0000)]
Merge "Allow customisation of advanced settings in DocumentsUI"
Edward Savage-Jones [Tue, 21 Jan 2014 14:45:44 +0000 (15:45 +0100)]
Allow customisation of advanced settings in DocumentsUI
Enables the customisation of the default value of the DocumentsUI
'advanced' setting using overlays.
Change-Id: I240cbb845d15ab2ea6ae7a79a17b4f51905fdb9c
Alex Klyubin [Thu, 3 Dec 2015 21:18:38 +0000 (21:18 +0000)]
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.
Alex Klyubin [Thu, 3 Dec 2015 21:10:46 +0000 (21:10 +0000)]
Merge "Stop using 512 bit RSA keys in keyset unit tests."
Alex Klyubin [Thu, 3 Dec 2015 20:52:23 +0000 (12:52 -0800)]
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
Yohei Yukawa [Thu, 3 Dec 2015 19:10:30 +0000 (19:10 +0000)]
Merge "Fix special handling of a fake language code "tl"."
am:
9fd2af6b32
* commit '
9fd2af6b323ef98695701a8bcfdd3ca1c4dd7965':
Fix special handling of a fake language code "tl".
Yohei Yukawa [Thu, 3 Dec 2015 19:04:24 +0000 (19:04 +0000)]
Merge "Fix special handling of a fake language code "tl"."
Christopher Wiley [Thu, 3 Dec 2015 17:46:58 +0000 (17:46 +0000)]
Merge "Map Errors.h\'s UNEXPECTED_NULL to NullPointerException"
am:
0ded0da517
* commit '
0ded0da51743a24707bece4b0be05f49db3b9981':
Map Errors.h's UNEXPECTED_NULL to NullPointerException
Christopher Wiley [Thu, 3 Dec 2015 17:43:43 +0000 (17:43 +0000)]
Merge "Map Errors.h's UNEXPECTED_NULL to NullPointerException"
Jeff Sharkey [Thu, 3 Dec 2015 17:07:50 +0000 (17:07 +0000)]
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
Jeff Sharkey [Thu, 3 Dec 2015 17:06:57 +0000 (17:06 +0000)]
Merge branch 'stage-aosp-master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into stage-aosp-master
Jeff Sharkey [Thu, 3 Dec 2015 17:06:24 +0000 (17:06 +0000)]
Merge "StrictMode: fix deserialization of ViolationInfo on large stacks"
am:
29e0b6e789
* commit '
29e0b6e7891091614a9e9dd6083017d0c9d454ae':
StrictMode: fix deserialization of ViolationInfo on large stacks
Jeff Sharkey [Thu, 3 Dec 2015 17:05:16 +0000 (17:05 +0000)]
Merge "StrictMode: fix deserialization of ViolationInfo on large stacks"
am:
29e0b6e789
* commit '
29e0b6e7891091614a9e9dd6083017d0c9d454ae':
StrictMode: fix deserialization of ViolationInfo on large stacks
Jeff Sharkey [Thu, 3 Dec 2015 17:03:53 +0000 (17:03 +0000)]
Merge "Fix race condition when collecting op callback."
am:
98844a97d2
* commit '
98844a97d2bd07146854783374ee3a19aed8edd5':
Fix race condition when collecting op callback.
Jeff Sharkey [Thu, 3 Dec 2015 17:02:21 +0000 (17:02 +0000)]
Merge "Improved variable naming"
am:
4ef9d41066
* commit '
4ef9d41066d8b4124c2c59752512adf24102634d':
Improved variable naming
Jeff Sharkey [Thu, 3 Dec 2015 16:59:58 +0000 (16:59 +0000)]
Merge "Avoid a double decrease of reference counter for unstable provider"
Jeff Sharkey [Thu, 3 Dec 2015 16:59:13 +0000 (16:59 +0000)]
Merge "StrictMode: fix deserialization of ViolationInfo on large stacks"
Jeff Sharkey [Thu, 3 Dec 2015 16:58:34 +0000 (16:58 +0000)]
Merge "Fix race condition when collecting op callback."
Jeff Sharkey [Thu, 3 Dec 2015 16:58:03 +0000 (16:58 +0000)]
Merge "Improved variable naming"
Yohei Yukawa [Thu, 3 Dec 2015 02:22:41 +0000 (18:22 -0800)]
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
Colin Cross [Thu, 3 Dec 2015 01:19:28 +0000 (01:19 +0000)]
Merge "Don\'t hardcode expected path to mainDexClasses"
am:
be1613379e
* commit '
be1613379e4814e9c54901d6e0171841e68f60ab':
Don't hardcode expected path to mainDexClasses
Colin Cross [Thu, 3 Dec 2015 01:12:05 +0000 (01:12 +0000)]
Merge "Don't hardcode expected path to mainDexClasses"
Colin Cross [Thu, 3 Dec 2015 00:24:08 +0000 (16:24 -0800)]
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
Robin Lee [Wed, 2 Dec 2015 12:41:20 +0000 (12:41 +0000)]
Merge "DevicePolicy: Always send ACTION_PASSWORD_CHANGED"
am:
3fe5a65b1c
* commit '
3fe5a65b1cc621d40f6278dd1e38d5ec58f92fb6':
DevicePolicy: Always send ACTION_PASSWORD_CHANGED
Robin Lee [Wed, 2 Dec 2015 12:35:14 +0000 (12:35 +0000)]
Merge "DevicePolicy: Always send ACTION_PASSWORD_CHANGED"
Chad Brubaker [Wed, 25 Nov 2015 22:23:14 +0000 (14:23 -0800)]
Use a custom TrustedCertificateStore
Providing a TrustedCertificateStore to TrustManagerImpl avoids loading
all of the trusted certificates into memory and indexing them. This
is mainly for the system certificate store where loading all of the
store into memory is wasteful for most applications.
Change-Id: I9e6057f6a13d38ea7762fcac2f62bd3ff475af39
Chad Brubaker [Tue, 1 Dec 2015 20:21:35 +0000 (20:21 +0000)]
Merge "Expose findTrustAnchorBySubjectAndPublicKey"
am:
6fea66116c
* commit '
6fea66116c79ecb5232a1c7ae66ae2a6e62c1c12':
Expose findTrustAnchorBySubjectAndPublicKey
Chad Brubaker [Tue, 1 Dec 2015 20:20:11 +0000 (20:20 +0000)]
Merge "Make NetworkSecurityConfigProvider.install lazy"
am:
73c06b1dbe
* commit '
73c06b1dbe08b3fc3786a3fab007f26398111f6a':
Make NetworkSecurityConfigProvider.install lazy
Chad Brubaker [Wed, 25 Nov 2015 21:12:55 +0000 (13:12 -0800)]
Expose findByIssuerAndSignature
This will be used to create a custom conscrypt TrustedCertificateStore
to avoid loading all of the trusted certificates into memory in a
keystore.
Change-Id: Iaf54b691393ecadae6c7ff56b8adc6a2a2923d29
Chad Brubaker [Tue, 1 Dec 2015 20:13:40 +0000 (20:13 +0000)]
Merge "Expose findTrustAnchorBySubjectAndPublicKey"
Chad Brubaker [Tue, 1 Dec 2015 20:13:23 +0000 (20:13 +0000)]
Merge "Make NetworkSecurityConfigProvider.install lazy"
Chad Brubaker [Mon, 16 Nov 2015 18:48:20 +0000 (10:48 -0800)]
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
Samuel Tan [Mon, 23 Nov 2015 22:36:00 +0000 (14:36 -0800)]
Add support for reading and writing double array values
Add support for reading and writing double arrays in
Parcel.readValue() and Parcel.writeValue.
Also, remove some trailing whitespaces in Parcel.java.
BUG:
25848659
Change-Id: Ib5430f492df4195051b83d9bf2b5163ec684bbff
Chad Brubaker [Sun, 29 Nov 2015 23:50:33 +0000 (23:50 +0000)]
Merge "Remove isCertificateEntry check"
am:
7d72975c5b
* commit '
7d72975c5b3e6f18710f078199e7a9e3f9376c60':
Remove isCertificateEntry check
Chad Brubaker [Sun, 29 Nov 2015 23:45:47 +0000 (23:45 +0000)]
Merge "Remove isCertificateEntry check"
Christopher Wiley [Sun, 22 Nov 2015 22:21:25 +0000 (14:21 -0800)]
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
Chad Brubaker [Thu, 26 Nov 2015 22:00:50 +0000 (14:00 -0800)]
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
Chad Brubaker [Thu, 19 Nov 2015 20:51:03 +0000 (12:51 -0800)]
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
Chad Brubaker [Wed, 25 Nov 2015 20:41:03 +0000 (20:41 +0000)]
Merge "Implement checkClientTrusted"
am:
8e19803a6a
* commit '
8e19803a6a10ac44ca59cf15a2ae1f2eedb13cf8':
Implement checkClientTrusted
Chad Brubaker [Wed, 25 Nov 2015 20:33:31 +0000 (20:33 +0000)]
Merge "Implement checkClientTrusted"
Chad Brubaker [Wed, 25 Nov 2015 18:39:28 +0000 (10:39 -0800)]
Implement checkClientTrusted
Bug:
25885029
Change-Id: I07ef11a556f1a1a65456ae5e3904c56902c6e82a
Alex Klyubin [Wed, 25 Nov 2015 19:05:09 +0000 (19:05 +0000)]
Merge "Custom engineUpdate/engineDoFinal(ByteBuffer, ByteBuffer)."
am:
e766e399c5
* commit '
e766e399c59669156284c330ae3f38f79230d930':
Custom engineUpdate/engineDoFinal(ByteBuffer, ByteBuffer).
Alex Klyubin [Wed, 25 Nov 2015 18:59:35 +0000 (18:59 +0000)]
Merge "Custom engineUpdate/engineDoFinal(ByteBuffer, ByteBuffer)."
Yury Zhauniarovich [Wed, 25 Nov 2015 14:53:20 +0000 (17:53 +0300)]
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>
Alex Klyubin [Wed, 25 Nov 2015 01:22:27 +0000 (17:22 -0800)]
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
Jim Kaye [Tue, 24 Nov 2015 19:33:57 +0000 (19:33 +0000)]
Merge "Extend the \'qwerty\' key layout"
am:
9a83f115ad
* commit '
9a83f115ade900a816f0fa2beae2cdd6f54bfc54':
Extend the 'qwerty' key layout
Jim Kaye [Tue, 24 Nov 2015 19:27:46 +0000 (19:27 +0000)]
Merge "Extend the 'qwerty' key layout"
Sergio Giro [Tue, 24 Nov 2015 15:43:06 +0000 (15:43 +0000)]
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
Sergio Giro [Tue, 24 Nov 2015 11:14:24 +0000 (11:14 +0000)]
Merge "ssl: make DistinguishedNameParser a package-private class in org.apache.http.conn.ssl"
Jim Kaye [Mon, 23 Nov 2015 20:22:59 +0000 (12:22 -0800)]
Extend the 'qwerty' key layout
Add the App Switch (Recents) key.
Add media control keys.
These are needed to support Emulator UI
buttons for these functions.
Change-Id: I3e9479bb49e21400f7bfd1435c50886038bbe0ff
Sergio Giro [Mon, 23 Nov 2015 15:14:52 +0000 (15:14 +0000)]
ssl: make DistinguishedNameParser a package-private class in org.apache.http.conn.ssl
Needed by AbstractVerifier in framework/base
DistinguishedNameParser taken from libcore, commit
b5259fcf87994ee18658f07887156aef3cab3b56
Change-Id: I924dc7cd21262e5e91857edf178e46c9916f3f6b
riddle_hsu [Mon, 23 Nov 2015 05:22:03 +0000 (13:22 +0800)]
Fix race condition when collecting op callback.
Other threads may change mOpModeWatchers, mPackageModeWatchers
by startWatchingMode, stopWatchingMode.
Change-Id: Id260172979ddfc2df9331880805d16ee13e183eb
Chris Tate [Fri, 20 Nov 2015 18:05:04 +0000 (18:05 +0000)]
Merge "Don\'t back up / restore EAP network definitions"
am:
14a0981fde
* commit '
14a0981fdef45967b19c3db4fb2f298c8b5a1f7c':
Don't back up / restore EAP network definitions
Chris Tate [Fri, 20 Nov 2015 18:01:10 +0000 (18:01 +0000)]
Merge "Don't back up / restore EAP network definitions"
Robin Lee [Thu, 19 Nov 2015 19:45:44 +0000 (19:45 +0000)]
DevicePolicy: Always send ACTION_PASSWORD_CHANGED
The old check looks a lot like an equality check, but it's not valid
because two passwords can share the same parameters.
For example:
'11Aa' and
'Y99z'
Are not different according to the old logic.
Bug:
25319928
Change-Id: Ia69861d9103670d1fc1dbf0130516e18e85e8de0
Nicolas Geoffray [Thu, 19 Nov 2015 15:54:21 +0000 (15:54 +0000)]
Merge "Update framework code after new ART options."
am:
d7d2817ade
* commit '
d7d2817ade8459a8f6872ff814d3208613502858':
Update framework code after new ART options.
Nicolas Geoffray [Thu, 19 Nov 2015 15:48:01 +0000 (15:48 +0000)]
Merge "Update framework code after new ART options."
Nicolas Geoffray [Thu, 19 Nov 2015 13:48:35 +0000 (13:48 +0000)]
Update framework code after new ART options.
Change-Id: I852a5975701653fe7e0cdd02e3c0b30a2b0b0b59
Christopher Tate [Wed, 18 Nov 2015 02:01:52 +0000 (18:01 -0800)]
Don't back up / restore EAP network definitions
Bug
25725016
Change-Id: Idfef9dd53f2403bbe4c950493a0ab8fa66a3b7d4
Andreas Gampe [Wed, 18 Nov 2015 17:47:52 +0000 (17:47 +0000)]
Merge "Frameworks/base: Make RuntimeAbort more expressive"
am:
b61d3dd8a7
* commit '
b61d3dd8a773be393c738675cff28fc799497535':
Frameworks/base: Make RuntimeAbort more expressive
Andreas Gampe [Wed, 18 Nov 2015 17:16:59 +0000 (17:16 +0000)]
Merge "Frameworks/base: Make RuntimeAbort more expressive"
Nicolas Geoffray [Wed, 18 Nov 2015 10:54:19 +0000 (10:54 +0000)]
Merge "Remove DEBUG_JIT from Zygote flags."
am:
cf49583bd0
* commit '
cf49583bd02d01b5d7aa57912d5469b466722c65':
Remove DEBUG_JIT from Zygote flags.
Nicolas Geoffray [Wed, 18 Nov 2015 10:47:50 +0000 (10:47 +0000)]
Merge "Remove DEBUG_JIT from Zygote flags."
Nicolas Geoffray [Thu, 5 Nov 2015 11:29:42 +0000 (11:29 +0000)]
Remove DEBUG_JIT from Zygote flags.
The flag is being obsolete by the move to JIT.
(cherry picked from commit
9abbf45c8dcdb2e5b13b615e5138ad996fe8afa3)
Change-Id: I3ce4577e81f91e9dd55d44116e0f9e2014bd00b8