OSDN Git Service
Darren Krahn [Fri, 5 Feb 2016 18:20:33 +0000 (18:20 +0000)]
Merge "nvram: Add const to input-only arrays."
am:
f8521f8b3c
* commit '
f8521f8b3c74a3a1221faafe33bd708b0a1fdfe8':
nvram: Add const to input-only arrays.
Darren Krahn [Fri, 5 Feb 2016 18:14:03 +0000 (18:14 +0000)]
Merge "nvram: Add const to input-only arrays."
Darren Krahn [Thu, 4 Feb 2016 21:57:27 +0000 (13:57 -0800)]
nvram: Add const to input-only arrays.
BUG=
24397987
Change-Id: I534a8fc978e10e1277cb0c87b5942d182f7c2a79
Dan Willemsen [Tue, 2 Feb 2016 04:40:34 +0000 (04:40 +0000)]
Merge "Remove header from LOCAL_SRC_FILES"
am:
5cfc02e4b1
* commit '
5cfc02e4b128296070a82f8e6ee4a83af3c9965b':
Remove header from LOCAL_SRC_FILES
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:11:35 +0000 (21:11 +0000)]
Merge "Add get_gatt_db to Bluetooth HAL"
am:
94eebcfa77
* commit '
94eebcfa77b9913840490dfdeb94c7de95647d69':
Add get_gatt_db to Bluetooth HAL
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:25:42 +0000 (23:25 +0000)]
Merge "Add KM_TAG_ALLOW_WHILE_ON_BODY."
am:
f704e8a939
* commit '
f704e8a939a4bfb85127b31e7226589e9e31b98d':
Add KM_TAG_ALLOW_WHILE_ON_BODY.
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 02:11:36 +0000 (02:11 +0000)]
Merge "Add header for new NVRAM HAL."
am:
6b09c49633
* commit '
6b09c49633d9e86c1bf888e440c8601f04bfa10c':
Add header for new NVRAM HAL.
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:50:54 +0000 (20:50 +0000)]
Merge "Add arguments to native dumpsys support"
am:
df4555d18d
* commit '
df4555d18d1a916de5d938a0d09ae2a078659c8e':
Add arguments to native dumpsys support
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:37:07 +0000 (17:37 +0000)]
Merge "Add keymaster2 HAL."
am:
0c5612db38
* commit '
0c5612db385d359a7caef385fd1815aad2de7a46':
Add keymaster2 HAL.
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:28:20 +0000 (02:28 +0000)]
Merge "Add Bluetooth network traffic accounting to HAL API"
am:
87882cc0f2
* commit '
87882cc0f2d4ae578eda1947a6c63e608d80234f':
Add Bluetooth network traffic accounting to HAL API
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 01:26:18 +0000 (01:26 +0000)]
Merge "Bluetooth: A2DP sink interface for Audio Focus change and AVRCP 1.3"
am:
c045e7b8ca
* commit '
c045e7b8ca9b915e33a12df81ea07dac85e3c454':
Bluetooth: A2DP sink interface for Audio Focus change and AVRCP 1.3
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:36:32 +0000 (23:36 +0000)]
Merge "Add structure for holding Bluetooth OOB data."
am:
6815181c0b
* commit '
6815181c0b8f184093c55d5a9f5ab5fa81f28864':
Add structure for holding Bluetooth OOB data.
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 01:05:06 +0000 (01:05 +0000)]
Merge "Libhardware: Fix tests"
am:
de5662d7fa
* commit '
de5662d7fae646205aebc030f4105f50610e8b82':
Libhardware: Fix tests
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 21:08:30 +0000 (21:08 +0000)]
Merge "libhardware: boot_control: Add isSlotMarkedSuccesful() function."
am:
e96eb0ddda
* commit '
e96eb0dddaa0c248e324a0e9f5dacc8eef646773':
libhardware: boot_control: Add isSlotMarkedSuccesful() function.
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:07:02 +0000 (07:07 -0800)]
Merge "libhardware: boot_control: Clarify documentation for isSlotBootable()."
am:
f73b52393c
* commit '
f73b52393ca097292cb89c5c1052c36e98acbc03':
libhardware: boot_control: Clarify documentation for isSlotBootable().
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
Ben Fennema [Wed, 2 Dec 2015 01:19:35 +0000 (01:19 +0000)]
Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data" am:
8b48359616 -s ours am:
500b648def -s ours
am:
0a37154ad7 -s ours
* commit '
0a37154ad76fd59edbbe2a1249c95409f6425e71':
Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"
Ben Fennema [Wed, 2 Dec 2015 01:14:56 +0000 (01:14 +0000)]
Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data" am:
8b48359616 -s ours
am:
500b648def -s ours
* commit '
500b648def50f279431b2d79637f1ae4846dfa3d':
Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"
Ben Fennema [Wed, 2 Dec 2015 01:11:25 +0000 (01:11 +0000)]
Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"
am:
8b48359616 -s ours
* commit '
8b483596168805d95740b979d21098b25188b6da':
Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"
Ben Fennema [Wed, 2 Dec 2015 01:04:06 +0000 (01:04 +0000)]
Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"
This reverts commit
4c690fc64eba65e2a13ece82e6c81367a48a003a.
Change-Id: I1ebf4c866606e004e2120d106f32973700f8bfeb
Jani Suonpera [Wed, 2 Dec 2015 00:33:40 +0000 (00:33 +0000)]
DO NOT MERGE ANYWHERE Add new interface for sensor physical data am:
4c690fc64e -s ours am:
8e32a28508 -s ours
am:
332241f214 -s ours
* commit '
332241f21446ebd4f0728c28c27882879c1dd6f8':
DO NOT MERGE ANYWHERE Add new interface for sensor physical data
Jani Suonpera [Wed, 2 Dec 2015 00:29:39 +0000 (00:29 +0000)]
DO NOT MERGE ANYWHERE Add new interface for sensor physical data am:
4c690fc64e -s ours
am:
8e32a28508 -s ours
* commit '
8e32a28508f063354d9991d74070b257c870409b':
DO NOT MERGE ANYWHERE Add new interface for sensor physical data
Jani Suonpera [Wed, 2 Dec 2015 00:25:42 +0000 (00:25 +0000)]
DO NOT MERGE ANYWHERE Add new interface for sensor physical data
am:
4c690fc64e -s ours
* commit '
4c690fc64eba65e2a13ece82e6c81367a48a003a':
DO NOT MERGE ANYWHERE Add new interface for sensor physical data
Jani Suonpera [Fri, 9 Oct 2015 09:00:40 +0000 (12:00 +0300)]
DO NOT MERGE ANYWHERE Add new interface for sensor physical data
This is spesical solution only for emerald branch.
Changes including new const char* value/interface for sensor physical data. Sensor service and manager does not take care of content, structure or other
details of string. Sensor HAL is taking care of parsing data from string and setting values to Sensor HW.
Change-Id: Iae69e04b71313fbcba46515d6787f3deef4e7346
Signed-off-by: Ben Fennema <fennema@google.com>
Shawn Willden [Mon, 23 Nov 2015 16:33:50 +0000 (16:33 +0000)]
Merge "ECIES: adding ECIES-KEM" am:
3aa7935ef2
am:
7adb2d457c
* commit '
7adb2d457c368a94c6a8e8b1e24926270421c5b8':
ECIES: adding ECIES-KEM
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
Rom Lemarchand [Thu, 19 Nov 2015 19:59:29 +0000 (19:59 +0000)]
boot: Add a boot_control HAL
am:
e43c086ee1
* commit '
e43c086ee10af04c3e0027460d87408c496c7877':
boot: Add a boot_control HAL
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>
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
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