OSDN Git Service
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
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/."
Elliott Hughes [Fri, 4 Dec 2015 23:33:35 +0000 (15:33 -0800)]
Track rename from base/ to android-base/.
Change-Id: I31be831de812052d1c0d4c0781178d0756124bcf
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 [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 [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
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
Andreas Gampe [Wed, 18 Nov 2015 00:38:59 +0000 (16:38 -0800)]
Frameworks/base: Make RuntimeAbort more expressive
Pass a message to FatalError, which will be more prominent in
aborts than "RuntimeAbort."
Change-Id: Icb3b8f50ca0cc15fd1346c530cd8e6452e951879
Stephen Hines [Tue, 17 Nov 2015 22:28:45 +0000 (22:28 +0000)]
Merge "Remove unsupported RS graphics API tests."
am:
7ea808b177
* commit '
7ea808b17736f690eb8d23729f33e9a612b0492c':
Remove unsupported RS graphics API tests.
Stephen Hines [Tue, 17 Nov 2015 22:16:35 +0000 (22:16 +0000)]
Merge "Remove unsupported RS graphics API tests."
Chad Brubaker [Tue, 17 Nov 2015 20:59:04 +0000 (20:59 +0000)]
Merge "Add NetworkSecurityConfigProvider.install"
am:
08181cf647
* commit '
08181cf647b1a1e440528f3f58ef6bf4e98a4832':
Add NetworkSecurityConfigProvider.install
Chad Brubaker [Tue, 17 Nov 2015 20:46:49 +0000 (20:46 +0000)]
Merge "Add NetworkSecurityConfigProvider.install"
Svetoslav Ganov [Tue, 17 Nov 2015 20:06:21 +0000 (20:06 +0000)]
Merge "Handle renamed packages during default grants"
am:
140b101fcd
* commit '
140b101fcdbdf413b914b5625b19577784ad9d88':
Handle renamed packages during default grants
Svetoslav Ganov [Tue, 17 Nov 2015 19:55:37 +0000 (19:55 +0000)]
Merge "Handle renamed packages during default grants"
Svet Ganov [Tue, 17 Nov 2015 19:53:18 +0000 (11:53 -0800)]
Handle renamed packages during default grants
If an L device has a privileged app on the system image which was
updated and an M OTA renames the app package (supported only for
privileged apps) we end up with a disabled system package setting
with no package information. Since we are not doing a null check
of the package we get from the disabled package settings during
default grants we crash leaving the system in a bad state.
bug:
25687380
Change-Id: I4f2ebcaf471e4bd1696298eab4716b50c52ca5c4
Colin Cross [Tue, 17 Nov 2015 19:51:57 +0000 (19:51 +0000)]
Merge "Vibra: Add loading of the vibrator hardware module."
am:
5603eca33c
* commit '
5603eca33c8e322997029d3101fd2442df3c274e':
Vibra: Add loading of the vibrator hardware module.
Colin Cross [Tue, 17 Nov 2015 19:31:19 +0000 (19:31 +0000)]
Merge "Vibra: Add loading of the vibrator hardware module."
Chad Brubaker [Tue, 17 Nov 2015 18:57:06 +0000 (18:57 +0000)]
Merge "Dedupe trust anchors"
am:
690b5f6c0a
* commit '
690b5f6c0a0820411d72235b11f75e1c87b24031':
Dedupe trust anchors
Chad Brubaker [Tue, 17 Nov 2015 18:51:38 +0000 (18:51 +0000)]
Merge "Dedupe trust anchors"
Eino-Ville Talvala [Tue, 17 Nov 2015 02:00:53 +0000 (02:00 +0000)]
Merge "Don\'t use timestamps with all zero"
am:
9574e58027
* commit '
9574e58027f8edeb539ecedf2988c1a302887807':
Don't use timestamps with all zero
Eino-Ville Talvala [Tue, 17 Nov 2015 01:55:38 +0000 (01:55 +0000)]
Merge "Don't use timestamps with all zero"
Chad Brubaker [Thu, 12 Nov 2015 18:55:28 +0000 (10:55 -0800)]
Add NetworkSecurityConfigProvider.install
This method is not currently called.
Change-Id: I73fd166b03009526868e0d9b5b209a9adaa4232f
Alex Klyubin [Mon, 16 Nov 2015 20:22:51 +0000 (20:22 +0000)]
Merge "Insert Android Keystore JCA Provider at the correct position."
am:
887d348d7e
* commit '
887d348d7ed5e1c2a1687eb774db46d571a8f43d':
Insert Android Keystore JCA Provider at the correct position.
Alex Klyubin [Mon, 16 Nov 2015 20:14:43 +0000 (20:14 +0000)]
Merge "Insert Android Keystore JCA Provider at the correct position."
Alex Klyubin [Sat, 14 Nov 2015 01:36:45 +0000 (17:36 -0800)]
Insert Android Keystore JCA Provider at the correct position.
Security.insertProviderAt uses 1-based positions whereas the
AndroidKeyStoreProvider.install code was incorrectly passing in
0-based positions, thus installing the AndroidKeyStoreBCWorkaround
provider one level higher than intended. This change fixes the issue
in AndroidKeyStoreProvider.
Bug:
25399691
Change-Id: I4a66bf37c0d151edb9a2349db9d91939064c0574
Mark Salyzyn [Mon, 16 Nov 2015 16:35:58 +0000 (16:35 +0000)]
Merge "Revert "jni: is loggable speedup, not within signal""
am:
3c54ed00f3
* commit '
3c54ed00f390e0ce9c555eb517594628b362705f':
Revert "jni: is loggable speedup, not within signal"
Mark Salyzyn [Mon, 16 Nov 2015 16:30:57 +0000 (16:30 +0000)]
Merge "Revert "jni: is loggable speedup, not within signal""
Mark Salyzyn [Mon, 16 Nov 2015 16:24:52 +0000 (16:24 +0000)]
Revert "jni: is loggable speedup, not within signal"
This reverts commit
c954fde0b6e31ec99509faf0bbc33c4c9e4d012a.
Bug:
25693940
Change-Id: I568051aad39e215d677318cd5758962e562187ef
Calin Juravle [Mon, 16 Nov 2015 11:20:55 +0000 (11:20 +0000)]
Merge "Remove obsolete profile handling from AndroidRuntime."
am:
360e95a90d
* commit '
360e95a90dab2c2522aa3ba13c6b2a3df737e626':
Remove obsolete profile handling from AndroidRuntime.
Calin Juravle [Mon, 16 Nov 2015 11:08:06 +0000 (11:08 +0000)]
Merge "Remove obsolete profile handling from AndroidRuntime."
Yang Ni [Fri, 13 Nov 2015 21:17:33 +0000 (21:17 +0000)]
Merge "Various fixes in setting globals in a script group"
am:
c011ffd842
* commit '
c011ffd84296700df4c28b9fc9fa84da9081de41':
Various fixes in setting globals in a script group
Yang Ni [Fri, 13 Nov 2015 21:11:25 +0000 (21:11 +0000)]
Merge "Various fixes in setting globals in a script group"
Yang Ni [Tue, 10 Nov 2015 21:27:04 +0000 (13:27 -0800)]
Various fixes in setting globals in a script group
Bug:
25602504
1) Passing floating point values into a script group was broken,
since they were casted to long values. Fixed that in the frameworks
implementation by taking the raw bits instead.
2) Passing 64-bit values into a script group was broken on 32-bit
platforms, since they were casted to pointer-sized integers
(uintptr_t) in the JNI code. Fixed that by casting to int64_t
instead.
3) Setting global variables of Allocation type in a script group was
broken. The special size value -1 was used to indicate the value is an
Allocation. However, size was casted to size_t in the JNI code.
Fixed that by using signed integers.
Change-Id: Ifff099a76be7707df7b67c388395f5a00f9cae66
Mark Salyzyn [Fri, 13 Nov 2015 15:22:05 +0000 (15:22 +0000)]
Merge "jni: is loggable speedup, not within signal"
am:
96e780c99c
* commit '
96e780c99c46e805989b7f1d6486cef96c7d2c27':
jni: is loggable speedup, not within signal
Mark Salyzyn [Fri, 13 Nov 2015 15:16:48 +0000 (15:16 +0000)]
Merge "jni: is loggable speedup, not within signal"
Michal Piechowski [Wed, 15 Apr 2015 11:03:50 +0000 (13:03 +0200)]
Don't use timestamps with all zero
Although all zero (0000:00:00) is valid time, in most cases it means
that value is not present. According to http://www.exiv2.org/Exif2-2.PDF
in such case those values should be omitted, however
some cameras set them to 0 anyway. With this commit such timestamps
will be treated as they were empty.
Change-Id: I9c762b1fa04ea6bf9c0fba9e2459a20430c71c90