Nick Vaccaro
69607fb3bc
am 990d26fd
: (-s ours) am 3f93d2a9
: Merge "libhardware: sensors: update multi hal to support 64bit builds"
...
* commit '990d26fd3b669751e1820e9a505ed00ba76c1f33':
2015-08-27 11:28:04 +00:00
Jim Miller
8225ff0f01
am 948b99ed
: (-s ours) am 929e0a19
: Add better documentation to fingerprint.h
...
* commit '948b99ed9d7fdc45e9512d51667fb2b3c161608b':
2015-08-27 11:28:03 +00:00
Shawn Willden
52f7a8af55
am 7ebe592c
: (-s ours) am 70335f3d
: Correct keymaster1 documentation.
...
* commit '7ebe592cb7e52e5b089dd27bedb68ee5dd91f6f8':
2015-08-27 11:28:02 +00:00
Alex Klyubin
13bbf68a7d
am ec585647
: (-s ours) am f9df59a7
: Merge "Add KM_TAG_MIN_MAC_LENGTH." into mnc-dev
...
* commit 'ec58564768e4aebb71910ed6066ce523bc14991c':
2015-08-27 11:28:02 +00:00
Eino-Ville Talvala
8ff07ad72c
am 98115660
: (-s ours) am d95a340b
: Merge "Camera2 tests: Fix incorrect error code check" into mnc-dev
...
* commit '9811566033a95fa9b92c500372642d108f9f8564':
2015-08-27 11:28:01 +00:00
Ruben Brunk
f7b87037a4
am cdb4e7c0
: (-s ours) am 49f58811
: Remove out-of-date camera2 native tests.
...
* commit 'cdb4e7c0b0d1fcb96ecb4aa2d3858f1f1963f371':
2015-08-27 11:27:58 +00:00
Shawn Willden
dfc38c3314
am b43c4701
: (-s ours) am 0a76e80b
: Merge "Fix extern "C" guards."
...
* commit 'b43c470125e783423e2a668aa9a203db3c52e7e4':
2015-08-27 11:27:56 +00:00
Elliott Hughes
8a241b82a9
am 69164f04
: Merge "Lose HAVE_ANDROID_OS from hardware/libhardware."
...
* commit '69164f045f62741460fcb4308025fcefa49fe38a':
Lose HAVE_ANDROID_OS from hardware/libhardware.
2015-08-13 00:40:27 +00:00
Elliott Hughes
69164f045f
Merge "Lose HAVE_ANDROID_OS from hardware/libhardware."
2015-08-12 23:47:25 +00:00
Elliott Hughes
ca6ccd924e
Lose HAVE_ANDROID_OS from hardware/libhardware.
...
Change-Id: I9f6bd154479e368aab0ff20798676d9cd409955c
2015-08-12 16:42:13 -07:00
Glenn Kasten
dbceefeab3
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
2015-08-07 17:07:14 +00:00
Glenn Kasten
aaf2d266f1
am 569737c6
: Merge "Add USB out_get_presentation_position() for timestamps" into mnc-dev
...
* commit '569737c6b0301a1411bd02cc9eb59e9c64c8a7eb':
Add USB out_get_presentation_position() for timestamps
2015-08-07 16:53:34 +00:00
Glenn Kasten
569737c6b0
Merge "Add USB out_get_presentation_position() for timestamps" into mnc-dev
2015-08-07 16:38:45 +00:00
Andy Hung
c9515ce60d
Add USB out_get_presentation_position() for timestamps
...
Bug: 21196672
Change-Id: Ic509e91a9c0d3421b78371207d7e63425e895e71
2015-08-06 11:16:45 -07:00
Ajay Panicker
aaaebe2aa5
am a7897020
: am b3759712
: Implement Bluetooth settings factory reset (4/5)
...
* commit 'a7897020c32ec32a14bdcc397230e5ccd4028939':
Implement Bluetooth settings factory reset (4/5)
2015-08-05 18:29:11 +00:00
Ajay Panicker
a7897020c3
am b3759712
: Implement Bluetooth settings factory reset (4/5)
...
* commit 'b3759712b0ab4ae294731ee5889c2ebd131a156f':
Implement Bluetooth settings factory reset (4/5)
2015-08-05 18:10:36 +00:00
Ajay Panicker
b3759712b0
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
2015-08-04 15:14:03 -07:00
Nick Vaccaro
990d26fd3b
am 3f93d2a9
: Merge "libhardware: sensors: update multi hal to support 64bit builds"
...
* commit '3f93d2a9705df0c4c341ac3e75b3751da82c98c6':
libhardware: sensors: update multi hal to support 64bit builds
2015-08-04 19:09:47 +00:00
Nick Vaccaro
993779c3c4
am 3f93d2a9
: Merge "libhardware: sensors: update multi hal to support 64bit builds"
...
* commit '3f93d2a9705df0c4c341ac3e75b3751da82c98c6':
libhardware: sensors: update multi hal to support 64bit builds
2015-08-04 19:09:33 +00:00
Nick Vaccaro
3f93d2a970
Merge "libhardware: sensors: update multi hal to support 64bit builds"
2015-08-04 18:58:04 +00:00
Jim Miller
7da2c5fe2a
am 3fabfd8e
: am 929e0a19
: Add better documentation to fingerprint.h
...
* commit '3fabfd8e4c3a66529846e21bc926f01019b6f769':
Add better documentation to fingerprint.h
2015-07-28 23:20:06 +00:00
Jim Miller
3fabfd8e4c
am 929e0a19
: Add better documentation to fingerprint.h
...
* commit '929e0a194ed989af9b9de62126a962ebf9d191cc':
Add better documentation to fingerprint.h
2015-07-28 22:41:05 +00:00
Jim Miller
948b99ed9d
am 929e0a19
: Add better documentation to fingerprint.h
...
* commit '929e0a194ed989af9b9de62126a962ebf9d191cc':
Add better documentation to fingerprint.h
2015-07-28 22:17:01 +00:00
Jim Miller
929e0a194e
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
2015-07-28 22:01:41 +00:00
Shawn Willden
25bff5c76e
am afac8dd6
: am 70335f3d
: Correct keymaster1 documentation.
...
* commit 'afac8dd61e6f0554f24b6d4375b8eb426ea08884':
Correct keymaster1 documentation.
2015-07-27 21:18:07 +00:00
Shawn Willden
afac8dd61e
am 70335f3d
: Correct keymaster1 documentation.
...
* commit '70335f3d30cf32a6f0352b75430aa6474821399d':
Correct keymaster1 documentation.
2015-07-27 20:51:19 +00:00
Shawn Willden
7ebe592cb7
am 70335f3d
: Correct keymaster1 documentation.
...
* commit '70335f3d30cf32a6f0352b75430aa6474821399d':
Correct keymaster1 documentation.
2015-07-27 20:34:12 +00:00
Ching Tzung Lin
be103ec8c7
am d4884e2f
: Merge "Fix compilation error on emerald-dev" into cw-e-dev
...
* commit 'd4884e2f3c138a7cc881bb1fb34b672a1c9db595':
Fix compilation error on emerald-dev
2015-07-23 23:24:44 +00:00
Ching Tzung Lin
d4884e2f3c
Merge "Fix compilation error on emerald-dev" into cw-e-dev
2015-07-23 22:57:03 +00:00
Alex Klyubin
a6ab97371c
am f9df59a7
: Merge "Add KM_TAG_MIN_MAC_LENGTH." into mnc-dev
...
* commit 'f9df59a7ff292b536a557280cb8b2fc93eedabd0':
Add KM_TAG_MIN_MAC_LENGTH.
2015-07-23 20:10:17 +00:00
Shawn Willden
70335f3d30
Correct keymaster1 documentation.
...
Bug: 22291207
Change-Id: I130d2ab2110321dc2228d41a154750da3a3f0b75
2015-07-23 12:54:15 -06:00
Ching Tzung Lin
4fd217a1c6
Fix compilation error on emerald-dev
...
Change-Id: I324fb9b1b54e31610fe4fdce8edbb6979e666cbb
2015-07-23 10:18:06 -07:00
Alex Klyubin
ec58564768
am f9df59a7
: Merge "Add KM_TAG_MIN_MAC_LENGTH." into mnc-dev
...
* commit 'f9df59a7ff292b536a557280cb8b2fc93eedabd0':
Add KM_TAG_MIN_MAC_LENGTH.
2015-07-22 20:18:50 +00:00
Alex Klyubin
f9df59a7ff
Merge "Add KM_TAG_MIN_MAC_LENGTH." into mnc-dev
2015-07-22 15:24:28 +00:00
Shawn Willden
a3f0ab55a7
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
2015-07-15 10:07:59 -06:00
Eino-Ville Talvala
797976876f
am d95a340b
: Merge "Camera2 tests: Fix incorrect error code check" into mnc-dev
...
* commit 'd95a340b9f74b38703e78b3e2e8bc43f49c3ebf8':
Camera2 tests: Fix incorrect error code check
2015-07-14 15:06:53 +00:00
Ruben Brunk
fa8430875c
am 49f58811
: Remove out-of-date camera2 native tests.
...
* commit '49f58811ea29ff8bed5e307d8018ead075731881':
Remove out-of-date camera2 native tests.
2015-07-14 15:06:52 +00:00
Eino-Ville Talvala
9811566033
am d95a340b
: Merge "Camera2 tests: Fix incorrect error code check" into mnc-dev
...
* commit 'd95a340b9f74b38703e78b3e2e8bc43f49c3ebf8':
Camera2 tests: Fix incorrect error code check
2015-07-13 07:20:03 +00:00
Ruben Brunk
cdb4e7c0b0
am 49f58811
: Remove out-of-date camera2 native tests.
...
* commit '49f58811ea29ff8bed5e307d8018ead075731881':
Remove out-of-date camera2 native tests.
2015-07-13 07:18:41 +00:00
Eino-Ville Talvala
d95a340b9f
Merge "Camera2 tests: Fix incorrect error code check" into mnc-dev
2015-07-11 00:32:27 +00:00
Eino-Ville Talvala
5ad8086ad7
Camera2 tests: Fix incorrect error code check
...
Bug: 22410279
Change-Id: Iad74e90d148908aafd39878608c10fe03c689b8a
2015-07-10 15:06:02 -07:00
Ruben Brunk
49f58811ea
Remove out-of-date camera2 native tests.
...
Bug: 22410279
Change-Id: Ib4a39306115e05b8e430bdc8456ad940b3426a8e
2015-07-10 14:45:56 -07:00
Shawn Willden
b43c470125
am 0a76e80b
: Merge "Fix extern "C" guards."
...
* commit '0a76e80be826cf7928ab554c303d4f9591b59b27':
Fix extern "C" guards.
2015-07-10 12:11:34 +00:00
Shawn Willden
8ec920226e
am 0a76e80b
: Merge "Fix extern "C" guards."
...
* commit '0a76e80be826cf7928ab554c303d4f9591b59b27':
Fix extern "C" guards.
2015-07-10 12:11:02 +00:00
Shawn Willden
0a76e80be8
Merge "Fix extern "C" guards."
2015-07-10 11:47:06 +00:00
Satya Durga Srinivasu Prabhala
1fd36183bf
libhardware: sensors: update multi hal to support 64bit builds
...
To get multi hal working on both 32 & 64 bit targets,
removing hardcoded paths & checks in multi HAL.
Sensor HAL libs must be installed path that is available through
LD_LIBRARY_PATH.
/system/lib & /system/vendor/lib for 32-bit targets.
/system/lib64 & /system/vendor/lib64 for 64-bit targets.
Change-Id: Ib1c1f25f08855c4584d53cc04fbe82a3a768b180
2015-07-08 12:32:34 -07:00
Shawn Willden
3d3a479253
Fix extern "C" guards.
...
Cherry-pick from internal.
Change-Id: I11ed50352865a099c3040a1558a48960ae7db416
2015-07-08 09:40:54 -06:00
Sasha Levitskiy
669288c53b
am a36ffbe0
: Fingerprint: Add post_enroll() API, adapt struct for binary compatibility, doc change.
...
* commit 'a36ffbe0bbccbc2173589da1941dd39ee01a8004':
Fingerprint: Add post_enroll() API, adapt struct for binary compatibility, doc change.
2015-07-01 00:06:11 +00:00
Sasha Levitskiy
a36ffbe0bb
Fingerprint: Add post_enroll() API, adapt struct for binary compatibility, doc change.
...
Change-Id: If7e5738f921b0e91e46efc813d9f3c4bd1502832
Signed-off-by: Sasha Levitskiy <sanek@google.com>
2015-06-26 15:10:20 -07:00
Shawn Willden
60e658b7f6
am bf31aab2
: Merge "Rename keymaster tag types to clarify that integers are unsigned."
...
* commit 'bf31aab2c8c2644e8f4d5baedaf2798c9760a0b7':
Rename keymaster tag types to clarify that integers are unsigned.
2015-06-25 05:43:04 +00:00