OSDN Git Service
Dan Willemsen [Tue, 2 Feb 2016 04:35:05 +0000 (04:35 +0000)]
Merge "Remove header from LOCAL_SRC_FILES"
Dan Willemsen [Tue, 2 Feb 2016 03:31:13 +0000 (19:31 -0800)]
Remove header from LOCAL_SRC_FILES
The build system does not use headers in LOCAL_SRC_FILES. To prevent
typos, it's now a warning to add something to LOCAL_SRC_FILES that
is not used.
Change-Id: Ieb6c6d383c04005077043d04f1b4985964ef0341
Andre Eisenbach [Fri, 29 Jan 2016 21:05:49 +0000 (21:05 +0000)]
Merge "Add get_gatt_db to Bluetooth HAL"
Jakub Pawlowski [Fri, 22 Jan 2016 07:40:51 +0000 (23:40 -0800)]
Add get_gatt_db to Bluetooth HAL
This patch adds new method, get_gatt_db to bluetooth HAL.
It can be used to grab whole GATT database in one request.
It will trigger get_gatt_db_callback, which is also part of
this patch.
Change-Id: I1a931f126db56e7a29537f3bca9cddff3dd27dc6
Shawn Willden [Thu, 28 Jan 2016 23:20:01 +0000 (23:20 +0000)]
Merge "Add KM_TAG_ALLOW_WHILE_ON_BODY."
Darren Krahn [Thu, 28 Jan 2016 01:39:35 +0000 (01:39 +0000)]
Merge "Add header for new NVRAM HAL."
Marie Janssen [Wed, 27 Jan 2016 20:42:08 +0000 (20:42 +0000)]
Merge "Add arguments to native dumpsys support"
Marie Janssen [Fri, 8 Jan 2016 19:16:29 +0000 (11:16 -0800)]
Add arguments to native dumpsys support
Arguments are passed through in order to support metrics logging and
future support for other dumpsys support in the native daemon.
Change-Id: Icaa75b9f36cca7e2dd2ceb5f94b27dec657d34e4
Shawn Willden [Tue, 26 Jan 2016 14:00:27 +0000 (07:00 -0700)]
Add KM_TAG_ALLOW_WHILE_ON_BODY.
Change-Id: I39ca0eee8be46a6acc65e975aad81d2f2c2aa5b8
Shawn Willden [Mon, 25 Jan 2016 17:33:00 +0000 (17:33 +0000)]
Merge "Add keymaster2 HAL."
Shawn Willden [Mon, 21 Dec 2015 23:29:10 +0000 (16:29 -0700)]
Add keymaster2 HAL.
Change-Id: Ibfcda30f33077f61e74701fa026983f9e72e140e
Adam Lesinski [Thu, 21 Jan 2016 02:23:51 +0000 (02:23 +0000)]
Merge "Add Bluetooth network traffic accounting to HAL API"
Adam Lesinski [Thu, 3 Dec 2015 19:40:47 +0000 (11:40 -0800)]
Add Bluetooth network traffic accounting to HAL API
Introduces a UID traffic struct and includes it in the API
for querying energy usage data.
Also adds the calling UID as a parameter for starting sockets
so that network traffic can be tracked.
Bug:
26039657
Change-Id: I9f4a130adc2846467063e7a9a4ea2231af06a80b
Sanket Agarwal [Wed, 20 Jan 2016 00:23:38 +0000 (00:23 +0000)]
Merge "Bluetooth: A2DP sink interface for Audio Focus change and AVRCP 1.3"
AnubhavGupta [Fri, 18 Sep 2015 09:04:02 +0000 (14:34 +0530)]
Bluetooth: A2DP sink interface for Audio Focus change and AVRCP 1.3
- Add interface to report audio focus change from Bluetooth Apk
to media task for A2DP Sink scenarios.
- Add interface to request audiofocus from system/bt.
- Add interfaces for AVRCP 1.3.
Change-Id: I687ea7be460b3ee3b082db9264621e2e24d04c0c
Darren Krahn [Fri, 18 Dec 2015 19:30:18 +0000 (11:30 -0800)]
Add header for new NVRAM HAL.
This HAL abstracts implementations of non-volatile storage with
hardware-backed access controls.
BUG=
24397987
Change-Id: Ia9935b138a7ad3e931c54e590570d233c9036e0f
Andre Eisenbach [Thu, 7 Jan 2016 23:31:52 +0000 (23:31 +0000)]
Merge "Add structure for holding Bluetooth OOB data."
Jakub Pawlowski [Tue, 1 Dec 2015 20:06:23 +0000 (12:06 -0800)]
Add structure for holding Bluetooth OOB data.
Change-Id: I0f59bf6343e519a7da830f57d242f9bdf18fca93
Andreas Gampe [Thu, 17 Dec 2015 00:57:30 +0000 (00:57 +0000)]
Merge "Libhardware: Fix tests"
Andreas Gampe [Wed, 16 Dec 2015 22:17:44 +0000 (14:17 -0800)]
Libhardware: Fix tests
Fix some warnings. Silence another. Less build noise.
Change-Id: Ibdbba093c2aca45343bfbe72c551b15d0f94e1b5
David Zeuthen [Wed, 9 Dec 2015 20:58:58 +0000 (20:58 +0000)]
Merge "libhardware: boot_control: Add isSlotMarkedSuccesful() function."
David Zeuthen [Wed, 9 Dec 2015 15:01:18 +0000 (15:01 +0000)]
Merge "libhardware: boot_control: Clarify documentation for isSlotBootable()."
David Zeuthen [Tue, 8 Dec 2015 18:21:29 +0000 (13:21 -0500)]
libhardware: boot_control: Add isSlotMarkedSuccesful() function.
This is useful in cases where the OS need to do some work (verification,
JIT'ing etc.) before it's ready to mark a slot as successful.
Change-Id: I114cfb7cf89ee227b186c56347446c850986d0b1
David Zeuthen [Tue, 8 Dec 2015 18:15:01 +0000 (13:15 -0500)]
libhardware: boot_control: Clarify documentation for isSlotBootable().
The documentation for this method is clearly wrong and it confused
several implementors.
Change-Id: I0427abcf87d0c8955ea1168513e6b9ab85380bf2
Shawn Willden [Mon, 23 Nov 2015 16:30:51 +0000 (16:30 +0000)]
Merge "ECIES: adding ECIES-KEM"
am:
3aa7935ef2
* commit '
3aa7935ef24946c1aa6db6c04fea10f39453c450':
ECIES: adding ECIES-KEM
Shawn Willden [Mon, 23 Nov 2015 16:27:03 +0000 (16:27 +0000)]
Merge "ECIES: adding ECIES-KEM"
Thai Duong [Fri, 3 Apr 2015 04:41:37 +0000 (21:41 -0700)]
ECIES: adding ECIES-KEM
Change-Id: Iea5877eba0a9b13610d3d1b33d04b5657edc3550
Eino-Ville Talvala [Tue, 17 Nov 2015 23:39:13 +0000 (23:39 +0000)]
Merge "Camera: Fix Metadata static info intialization"
am:
f7b855ac28
* commit '
f7b855ac2813e5593db48ba9ba1002f3d56d38b8':
Camera: Fix Metadata static info intialization
Eino-Ville Talvala [Tue, 17 Nov 2015 23:34:40 +0000 (23:34 +0000)]
Merge "Camera: Fix Metadata static info intialization"
Colin Cross [Tue, 17 Nov 2015 19:53:02 +0000 (19:53 +0000)]
Merge "Vibrator: clarify the API"
am:
8447aed332
* commit '
8447aed33271c3f53849923327d6cfa3f4999e09':
Vibrator: clarify the API
Colin Cross [Tue, 17 Nov 2015 19:31:22 +0000 (19:31 +0000)]
Merge "Vibrator: clarify the API"
Jacopo Mondi [Tue, 18 Aug 2015 15:45:39 +0000 (17:45 +0200)]
Camera: Fix Metadata static info intialization
The Metadata module segfaults when asked to initialize camera_info, upon
camera description request coming from framework.
This was caused by missing intialization of mData instance field.
Additionally, when intializing it with a template metadata, the
validation function return value was wrongly tested
Patchset 2: Do not init mData but let function flow take care of
replacing it after adding new data to it fails.
Change-Id: Iae228f0d66171ed3eac430186ced4d9b023f8de8
Signed-off-by: Jacopo Mondi <jacopo.mondi@linaro.org>
Aravind Akella [Wed, 14 Oct 2015 21:19:58 +0000 (21:19 +0000)]
am
29b03118: am
1ce7fe6b: Merge "Fix DATA_INJECTION flag in sensors.h" into mnc-dr-dev
* commit '
29b0311870b151fb93420ac0844b87855346a807':
Fix DATA_INJECTION flag in sensors.h
Aravind Akella [Wed, 14 Oct 2015 21:08:12 +0000 (21:08 +0000)]
am
1ce7fe6b: Merge "Fix DATA_INJECTION flag in sensors.h" into mnc-dr-dev
* commit '
1ce7fe6b0a887edc6fad8e3386ab8e28a5f0d107':
Fix DATA_INJECTION flag in sensors.h
Aravind Akella [Wed, 14 Oct 2015 21:03:13 +0000 (21:03 +0000)]
Merge "Fix DATA_INJECTION flag in sensors.h" into mnc-dr-dev
Andy Hung [Wed, 14 Oct 2015 01:28:33 +0000 (01:28 +0000)]
am
9a2f2ef1: am
419c27b9: Do not reset out_get_presentation_position() to 0 on standby
* commit '
9a2f2ef14f6655cb4f71edca2553bbad3cc62795':
Do not reset out_get_presentation_position() to 0 on standby
Andy Hung [Wed, 14 Oct 2015 01:18:31 +0000 (01:18 +0000)]
am
419c27b9: Do not reset out_get_presentation_position() to 0 on standby
* commit '
419c27b937b1628340985ac27f1d577e41b9a60e':
Do not reset out_get_presentation_position() to 0 on standby
Andy Hung [Mon, 10 Aug 2015 20:52:34 +0000 (13:52 -0700)]
Do not reset out_get_presentation_position() to 0 on standby
Bug:
21199150
Bug:
23080499
Change-Id: I749b331bfce8cfe27b16bb2fce14f23816fb48ce
Michael Wright [Tue, 22 Sep 2015 18:35:25 +0000 (18:35 +0000)]
am
70097605: am
147d5404: Define the data parameter for POWER_HINT_INTERACTION.
* commit '
7009760593d457902fed7d90fe924cf20f3d0604':
Define the data parameter for POWER_HINT_INTERACTION.
Michael Wright [Tue, 22 Sep 2015 18:21:00 +0000 (18:21 +0000)]
am
147d5404: Define the data parameter for POWER_HINT_INTERACTION.
* commit '
147d5404f5958133c291cc26adb5a781d7ac2ea8':
Define the data parameter for POWER_HINT_INTERACTION.
Shawn Willden [Thu, 17 Sep 2015 00:50:55 +0000 (00:50 +0000)]
am
94e514eb: am
e5a69c0d: Merge "Correct keymaster1 documentation."
* commit '
94e514eb78714edd9267822a00b688b52ceeceeb':
Correct keymaster1 documentation.
Shawn Willden [Thu, 17 Sep 2015 00:41:22 +0000 (00:41 +0000)]
am
e5a69c0d: Merge "Correct keymaster1 documentation."
* commit '
e5a69c0de7994a77653adda6a26f3e84f5bf81f4':
Correct keymaster1 documentation.
Shawn Willden [Thu, 17 Sep 2015 00:32:35 +0000 (00:32 +0000)]
Merge "Correct keymaster1 documentation."
Shawn Willden [Wed, 8 Jul 2015 15:57:16 +0000 (09:57 -0600)]
Correct keymaster1 documentation.
Bug:
22291207
Change-Id: Ib0b54d40d04ef3bb2fca6bf65d005b5432782482
Michael Wright [Wed, 16 Sep 2015 22:28:19 +0000 (23:28 +0100)]
Define the data parameter for POWER_HINT_INTERACTION.
Change-Id: I86857c1ea92082de109c612080e47c9c9835726b
Shawn Willden [Fri, 11 Sep 2015 23:04:52 +0000 (23:04 +0000)]
am
1257a2aa: am
d527792f: Merge "Add KM_TAG_MIN_MAC_LENGTH."
* commit '
1257a2aa9beefd7cd581ba69173890b07303ef8b':
Add KM_TAG_MIN_MAC_LENGTH.
Shawn Willden [Fri, 11 Sep 2015 21:46:33 +0000 (21:46 +0000)]
am
d527792f: Merge "Add KM_TAG_MIN_MAC_LENGTH."
* commit '
d527792f1fe9554add1fe7b1b17eb62ae9de4a43':
Add KM_TAG_MIN_MAC_LENGTH.
Aravind Akella [Thu, 10 Sep 2015 22:00:51 +0000 (15:00 -0700)]
Fix DATA_INJECTION flag in sensors.h
Bug:
24001171
Change-Id: Ia42934a97566f0ebe8d324e065351a3d9ed55621
Shawn Willden [Fri, 11 Sep 2015 13:21:16 +0000 (13:21 +0000)]
Merge "Add KM_TAG_MIN_MAC_LENGTH."
Shawn Willden [Wed, 8 Jul 2015 12:04:52 +0000 (06:04 -0600)]
Add KM_TAG_MIN_MAC_LENGTH.
This allows the binding of minimum length for MACs or tags to HMAC keys
and AEAD symmetric keys. Later attempts to use these keys with a
shorter MAC or tag specification (provided to begin() with
KM_TAG_MAC_LENGTH) will fail with KM_ERROR_INVALID_MAC_LENGTH.
Bug:
22337277
Change-Id: Ic5292ce01bdd6ecde25aad115e4b407aadc85f23
Dan Stoza [Fri, 4 Sep 2015 02:21:33 +0000 (02:21 +0000)]
am
5cdefc7b: am
95f01799: HWC: Add a color transform attribute per display
* commit '
5cdefc7b6fedac0b84bf78aa8d695a7d34c042b1':
HWC: Add a color transform attribute per display
Dan Stoza [Thu, 3 Sep 2015 22:03:04 +0000 (22:03 +0000)]
am
95f01799: HWC: Add a color transform attribute per display
* commit '
95f017990ba70ba3ed22eac4f61c4f02cfc79045':
HWC: Add a color transform attribute per display
Dan Stoza [Mon, 31 Aug 2015 19:08:57 +0000 (12:08 -0700)]
HWC: Add a color transform attribute per display
Adds a color transform option to the queryable display attributes,
which allows a different vendor-specific color transform (e.g., wide
gamut, sRGB, etc.) per display configuration. This does not increase the
HWC version, and is considered a part of HWC 1.5, though if
getDisplayAttributes returns an error code as a result of being passed
an unsupported attribute, the call will be retried without the new color
transform option.
Bug:
20853317
Change-Id: Iab1605bc073ed4caa780e55ddf396efeeff3aff1
Daniel Rosenberg [Fri, 28 Aug 2015 21:29:30 +0000 (21:29 +0000)]
am
92290228: am
fef6638e: Merge "boot: Add a boot_control HAL"
* commit '
92290228f9254a2bf71172216d7f989becaad54d':
boot: Add a boot_control HAL
Daniel Rosenberg [Fri, 28 Aug 2015 21:24:51 +0000 (21:24 +0000)]
am
fef6638e: Merge "boot: Add a boot_control HAL"
* commit '
fef6638e82a8b3140f45e7ce410ad72609821142':
boot: Add a boot_control HAL
Daniel Rosenberg [Fri, 28 Aug 2015 21:17:42 +0000 (21:17 +0000)]
Merge "boot: Add a boot_control HAL"
Rom Lemarchand [Fri, 14 Aug 2015 21:58:21 +0000 (14:58 -0700)]
boot: Add a boot_control HAL
The purpose of the boot control HAL is to communicate with the
bootloader and set various flags letting the bootloader know which
partition to boot
Change-Id: I15178abaaf9ca208b1e5300c9207cedbb7950a88
Elliott Hughes [Thu, 27 Aug 2015 11:28:06 +0000 (11:28 +0000)]
am
e830df33: (-s ours) am
69164f04: Merge "Lose HAVE_ANDROID_OS from hardware/libhardware."
* commit '
e830df33e9028e33137b425401e78d00e456aea2':
Glenn Kasten [Thu, 27 Aug 2015 11:28:05 +0000 (11:28 +0000)]
am
3b78a249: (-s ours) am
569737c6: Merge "Add USB out_get_presentation_position() for timestamps" into mnc-dev
* commit '
3b78a2497fef8d6620c64993eaf075b8c547c8de':
Ajay Panicker [Thu, 27 Aug 2015 11:28:04 +0000 (11:28 +0000)]
am
ca76ccfa: (-s ours) am
b3759712: Implement Bluetooth settings factory reset (4/5)
* commit '
ca76ccfaa0176bad50771e14a1c417db77290654':
Nick Vaccaro [Thu, 27 Aug 2015 11:28:04 +0000 (11:28 +0000)]
am
990d26fd: (-s ours) am
3f93d2a9: Merge "libhardware: sensors: update multi hal to support 64bit builds"
* commit '
990d26fd3b669751e1820e9a505ed00ba76c1f33':
Jim Miller [Thu, 27 Aug 2015 11:28:03 +0000 (11:28 +0000)]
am
948b99ed: (-s ours) am
929e0a19: Add better documentation to fingerprint.h
* commit '
948b99ed9d7fdc45e9512d51667fb2b3c161608b':
Shawn Willden [Thu, 27 Aug 2015 11:28:02 +0000 (11:28 +0000)]
am
7ebe592c: (-s ours) am
70335f3d: Correct keymaster1 documentation.
* commit '
7ebe592cb7e52e5b089dd27bedb68ee5dd91f6f8':
Alex Klyubin [Thu, 27 Aug 2015 11:28:02 +0000 (11:28 +0000)]
am
ec585647: (-s ours) am
f9df59a7: Merge "Add KM_TAG_MIN_MAC_LENGTH." into mnc-dev
* commit '
ec58564768e4aebb71910ed6066ce523bc14991c':
Eino-Ville Talvala [Thu, 27 Aug 2015 11:28:01 +0000 (11:28 +0000)]
am
98115660: (-s ours) am
d95a340b: Merge "Camera2 tests: Fix incorrect error code check" into mnc-dev
* commit '
9811566033a95fa9b92c500372642d108f9f8564':
Ruben Brunk [Thu, 27 Aug 2015 11:27:58 +0000 (11:27 +0000)]
am
cdb4e7c0: (-s ours) am
49f58811: Remove out-of-date camera2 native tests.
* commit '
cdb4e7c0b0d1fcb96ecb4aa2d3858f1f1963f371':
Shawn Willden [Thu, 27 Aug 2015 11:27:56 +0000 (11:27 +0000)]
am
b43c4701: (-s ours) am
0a76e80b: Merge "Fix extern "C" guards."
* commit '
b43c470125e783423e2a668aa9a203db3c52e7e4':
Elliott Hughes [Thu, 13 Aug 2015 00:40:31 +0000 (00:40 +0000)]
am
69164f04: Merge "Lose HAVE_ANDROID_OS from hardware/libhardware."
* commit '
69164f045f62741460fcb4308025fcefa49fe38a':
Lose HAVE_ANDROID_OS from hardware/libhardware.
Elliott Hughes [Thu, 13 Aug 2015 00:40:27 +0000 (00:40 +0000)]
am
69164f04: Merge "Lose HAVE_ANDROID_OS from hardware/libhardware."
* commit '
69164f045f62741460fcb4308025fcefa49fe38a':
Lose HAVE_ANDROID_OS from hardware/libhardware.
Elliott Hughes [Wed, 12 Aug 2015 23:47:25 +0000 (23:47 +0000)]
Merge "Lose HAVE_ANDROID_OS from hardware/libhardware."
Elliott Hughes [Wed, 12 Aug 2015 23:42:13 +0000 (16:42 -0700)]
Lose HAVE_ANDROID_OS from hardware/libhardware.
Change-Id: I9f6bd154479e368aab0ff20798676d9cd409955c
Glenn Kasten [Fri, 7 Aug 2015 17:07:14 +0000 (17:07 +0000)]
am
aaf2d266: am
569737c6: Merge "Add USB out_get_presentation_position() for timestamps" into mnc-dev
* commit '
aaf2d266f14adffdc6d77f2eb1bd30c43999b923':
Add USB out_get_presentation_position() for timestamps
Glenn Kasten [Fri, 7 Aug 2015 16:53:34 +0000 (16:53 +0000)]
am
569737c6: Merge "Add USB out_get_presentation_position() for timestamps" into mnc-dev
* commit '
569737c6b0301a1411bd02cc9eb59e9c64c8a7eb':
Add USB out_get_presentation_position() for timestamps
Glenn Kasten [Fri, 7 Aug 2015 16:47:20 +0000 (16:47 +0000)]
am
569737c6: Merge "Add USB out_get_presentation_position() for timestamps" into mnc-dev
* commit '
569737c6b0301a1411bd02cc9eb59e9c64c8a7eb':
Add USB out_get_presentation_position() for timestamps
Glenn Kasten [Fri, 7 Aug 2015 16:38:45 +0000 (16:38 +0000)]
Merge "Add USB out_get_presentation_position() for timestamps" into mnc-dev
Andy Hung [Tue, 4 Aug 2015 22:05:19 +0000 (15:05 -0700)]
Add USB out_get_presentation_position() for timestamps
Bug:
21196672
Change-Id: Ic509e91a9c0d3421b78371207d7e63425e895e71
Ajay Panicker [Wed, 5 Aug 2015 18:29:11 +0000 (18:29 +0000)]
am
a7897020: am
b3759712: Implement Bluetooth settings factory reset (4/5)
* commit '
a7897020c32ec32a14bdcc397230e5ccd4028939':
Implement Bluetooth settings factory reset (4/5)
Ajay Panicker [Wed, 5 Aug 2015 18:10:36 +0000 (18:10 +0000)]
am
b3759712: Implement Bluetooth settings factory reset (4/5)
* commit '
b3759712b0ab4ae294731ee5889c2ebd131a156f':
Implement Bluetooth settings factory reset (4/5)
Ajay Panicker [Wed, 5 Aug 2015 18:00:51 +0000 (18:00 +0000)]
am
b3759712: Implement Bluetooth settings factory reset (4/5)
* commit '
b3759712b0ab4ae294731ee5889c2ebd131a156f':
Implement Bluetooth settings factory reset (4/5)
Ajay Panicker [Tue, 28 Jul 2015 23:53:53 +0000 (16:53 -0700)]
Implement Bluetooth settings factory reset (4/5)
Implemented the factory reset function to be used to reset all bluetooth
settings on device to factory default
Bug:
16161518
Change-Id: I69358db95582ddd0f2f640f76cf0931f797d369b
Nick Vaccaro [Tue, 4 Aug 2015 19:09:47 +0000 (19:09 +0000)]
am
3f93d2a9: Merge "libhardware: sensors: update multi hal to support 64bit builds"
* commit '
3f93d2a9705df0c4c341ac3e75b3751da82c98c6':
libhardware: sensors: update multi hal to support 64bit builds
Nick Vaccaro [Tue, 4 Aug 2015 19:09:33 +0000 (19:09 +0000)]
am
3f93d2a9: Merge "libhardware: sensors: update multi hal to support 64bit builds"
* commit '
3f93d2a9705df0c4c341ac3e75b3751da82c98c6':
libhardware: sensors: update multi hal to support 64bit builds
Nick Vaccaro [Tue, 4 Aug 2015 18:58:04 +0000 (18:58 +0000)]
Merge "libhardware: sensors: update multi hal to support 64bit builds"
Jim Miller [Tue, 28 Jul 2015 23:20:06 +0000 (23:20 +0000)]
am
3fabfd8e: am
929e0a19: Add better documentation to fingerprint.h
* commit '
3fabfd8e4c3a66529846e21bc926f01019b6f769':
Add better documentation to fingerprint.h
Jim Miller [Tue, 28 Jul 2015 22:41:05 +0000 (22:41 +0000)]
am
929e0a19: Add better documentation to fingerprint.h
* commit '
929e0a194ed989af9b9de62126a962ebf9d191cc':
Add better documentation to fingerprint.h
Jim Miller [Tue, 28 Jul 2015 22:17:01 +0000 (22:17 +0000)]
am
929e0a19: Add better documentation to fingerprint.h
* commit '
929e0a194ed989af9b9de62126a962ebf9d191cc':
Add better documentation to fingerprint.h
Jim Miller [Sat, 25 Jul 2015 01:25:40 +0000 (18:25 -0700)]
Add better documentation to fingerprint.h
Some vendors are confused by the use of errors vs acquired messages
This adds documentation on how they should be used.
Fixes bug
22728578
Change-Id: I5e6a8f7b159ec331a59202fa64b7320e43661429
Shawn Willden [Mon, 27 Jul 2015 21:18:07 +0000 (21:18 +0000)]
am
afac8dd6: am
70335f3d: Correct keymaster1 documentation.
* commit '
afac8dd61e6f0554f24b6d4375b8eb426ea08884':
Correct keymaster1 documentation.
Shawn Willden [Mon, 27 Jul 2015 20:51:19 +0000 (20:51 +0000)]
am
70335f3d: Correct keymaster1 documentation.
* commit '
70335f3d30cf32a6f0352b75430aa6474821399d':
Correct keymaster1 documentation.
Shawn Willden [Mon, 27 Jul 2015 20:34:12 +0000 (20:34 +0000)]
am
70335f3d: Correct keymaster1 documentation.
* commit '
70335f3d30cf32a6f0352b75430aa6474821399d':
Correct keymaster1 documentation.
Ching Tzung Lin [Thu, 23 Jul 2015 23:24:44 +0000 (23:24 +0000)]
am
d4884e2f: Merge "Fix compilation error on emerald-dev" into cw-e-dev
* commit '
d4884e2f3c138a7cc881bb1fb34b672a1c9db595':
Fix compilation error on emerald-dev
Ching Tzung Lin [Thu, 23 Jul 2015 22:57:03 +0000 (22:57 +0000)]
Merge "Fix compilation error on emerald-dev" into cw-e-dev
Alex Klyubin [Thu, 23 Jul 2015 20:10:17 +0000 (20:10 +0000)]
am
f9df59a7: Merge "Add KM_TAG_MIN_MAC_LENGTH." into mnc-dev
* commit '
f9df59a7ff292b536a557280cb8b2fc93eedabd0':
Add KM_TAG_MIN_MAC_LENGTH.
Shawn Willden [Wed, 8 Jul 2015 15:57:16 +0000 (09:57 -0600)]
Correct keymaster1 documentation.
Bug:
22291207
Change-Id: I130d2ab2110321dc2228d41a154750da3a3f0b75
Ching Tzung Lin [Thu, 23 Jul 2015 17:18:06 +0000 (10:18 -0700)]
Fix compilation error on emerald-dev
Change-Id: I324fb9b1b54e31610fe4fdce8edbb6979e666cbb
Alex Klyubin [Wed, 22 Jul 2015 20:18:50 +0000 (20:18 +0000)]
am
f9df59a7: Merge "Add KM_TAG_MIN_MAC_LENGTH." into mnc-dev
* commit '
f9df59a7ff292b536a557280cb8b2fc93eedabd0':
Add KM_TAG_MIN_MAC_LENGTH.
Alex Klyubin [Wed, 22 Jul 2015 15:24:28 +0000 (15:24 +0000)]
Merge "Add KM_TAG_MIN_MAC_LENGTH." into mnc-dev
Shawn Willden [Wed, 8 Jul 2015 12:04:52 +0000 (06:04 -0600)]
Add KM_TAG_MIN_MAC_LENGTH.
This allows the binding of minimum length for MACs or tags to HMAC keys
and AEAD symmetric keys. Later attempts to use these keys with a
shorter MAC or tag specification (provided to begin() with
KM_TAG_MAC_LENGTH) will fail with KM_ERROR_INVALID_MAC_LENGTH.
Bug:
22337277
Change-Id: Ic5292ce01bdd6ecde25aad115e4b407aadc85f23
Eino-Ville Talvala [Tue, 14 Jul 2015 15:06:53 +0000 (15:06 +0000)]
am
d95a340b: Merge "Camera2 tests: Fix incorrect error code check" into mnc-dev
* commit '
d95a340b9f74b38703e78b3e2e8bc43f49c3ebf8':
Camera2 tests: Fix incorrect error code check
Ruben Brunk [Tue, 14 Jul 2015 15:06:52 +0000 (15:06 +0000)]
am
49f58811: Remove out-of-date camera2 native tests.
* commit '
49f58811ea29ff8bed5e307d8018ead075731881':
Remove out-of-date camera2 native tests.
OSDN Git Service
