Daniel Rosenberg
92290228f9
am fef6638e
: Merge "boot: Add a boot_control HAL"
...
* commit 'fef6638e82a8b3140f45e7ce410ad72609821142':
boot: Add a boot_control HAL
2015-08-28 21:24:51 +00:00
Daniel Rosenberg
fef6638e82
Merge "boot: Add a boot_control HAL"
2015-08-28 21:17:42 +00:00
Rom Lemarchand
a13a426a7d
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
2015-08-28 13:45:41 -07:00
Elliott Hughes
076e9642f4
am b336cb04
: am e830df33
: (-s ours) am 69164f04
: Merge "Lose HAVE_ANDROID_OS from hardware/libhardware."
...
* commit 'b336cb0472ae2d48a19abb3ba153153c3ec7a1fa':
2015-08-27 14:43:26 +00:00
Glenn Kasten
cf96292ad0
am ab904ce5
: am 3b78a249
: (-s ours) am 569737c6
: Merge "Add USB out_get_presentation_position() for timestamps" into mnc-dev
...
* commit 'ab904ce52661b63a29fc6be278a7cca5377cd796':
2015-08-27 14:43:25 +00:00
Ajay Panicker
663ebf5cd4
am e03ef71c
: am ca76ccfa
: (-s ours) am b3759712
: Implement Bluetooth settings factory reset (4/5)
...
* commit 'e03ef71c424bc2944640c8a703aa97dd8447d4ca':
2015-08-27 14:43:25 +00:00
Nick Vaccaro
a20f8efa6e
am 69607fb3
: am 990d26fd
: (-s ours) am 3f93d2a9
: Merge "libhardware: sensors: update multi hal to support 64bit builds"
...
* commit '69607fb3bc142248d21a09fa872e1f8f96371bea':
2015-08-27 14:43:24 +00:00
Jim Miller
d7e2f15745
am 8225ff0f
: am 948b99ed
: (-s ours) am 929e0a19
: Add better documentation to fingerprint.h
...
* commit '8225ff0f0175668d4f9b3acb5ba20d3c39dc727c':
2015-08-27 14:43:23 +00:00
Shawn Willden
0d05323588
am 52f7a8af
: am 7ebe592c
: (-s ours) am 70335f3d
: Correct keymaster1 documentation.
...
* commit '52f7a8af55e8e6264f12dd8a1c23dcc1eecacc83':
2015-08-27 14:43:23 +00:00
Alex Klyubin
772e04fcd3
am 13bbf68a
: am ec585647
: (-s ours) am f9df59a7
: Merge "Add KM_TAG_MIN_MAC_LENGTH." into mnc-dev
...
* commit '13bbf68a7d2169473b9a47c3084e7d1325eb83d3':
2015-08-27 14:43:22 +00:00
Eino-Ville Talvala
8ac8a9c29a
am 8ff07ad7
: am 98115660
: (-s ours) am d95a340b
: Merge "Camera2 tests: Fix incorrect error code check" into mnc-dev
...
* commit '8ff07ad72ce6aeebd1bab6b89f4e4f0fc31407b7':
2015-08-27 14:43:21 +00:00
Ruben Brunk
92e3cd7d23
am f7b87037
: am cdb4e7c0
: (-s ours) am 49f58811
: Remove out-of-date camera2 native tests.
...
* commit 'f7b87037a4ec6172bf00ed203fac17fa585c9f29':
2015-08-27 14:43:20 +00:00
Shawn Willden
2fd07baedb
am dfc38c33
: am b43c4701
: (-s ours) am 0a76e80b
: Merge "Fix extern "C" guards."
...
* commit 'dfc38c33143e57d6ab83a76e635684ece8df5430':
2015-08-27 14:43:20 +00:00
Elliott Hughes
b336cb0472
am e830df33
: (-s ours) am 69164f04
: Merge "Lose HAVE_ANDROID_OS from hardware/libhardware."
...
* commit 'e830df33e9028e33137b425401e78d00e456aea2':
2015-08-27 11:28:06 +00:00
Glenn Kasten
ab904ce526
am 3b78a249
: (-s ours) am 569737c6
: Merge "Add USB out_get_presentation_position() for timestamps" into mnc-dev
...
* commit '3b78a2497fef8d6620c64993eaf075b8c547c8de':
2015-08-27 11:28:05 +00:00
Ajay Panicker
e03ef71c42
am ca76ccfa
: (-s ours) am b3759712
: Implement Bluetooth settings factory reset (4/5)
...
* commit 'ca76ccfaa0176bad50771e14a1c417db77290654':
2015-08-27 11:28:04 +00:00
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
Andy Hung
59475f98e7
Merge "Do not reset out_get_presentation_position() to 0 on standby"
2015-08-24 18:16:54 +00:00
Elliott Hughes
4a34f08027
am 8a241b82
: am 69164f04
: Merge "Lose HAVE_ANDROID_OS from hardware/libhardware."
...
* commit '8a241b82a9878a35183cb0bd30e9d1cb67e6f087':
Lose HAVE_ANDROID_OS from hardware/libhardware.
2015-08-13 00:46:31 +00:00
Elliott Hughes
e830df33e9
am 69164f04
: Merge "Lose HAVE_ANDROID_OS from hardware/libhardware."
...
* commit '69164f045f62741460fcb4308025fcefa49fe38a':
Lose HAVE_ANDROID_OS from hardware/libhardware.
2015-08-13 00:40:31 +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
Andy Hung
0b93c0ab58
Do not reset out_get_presentation_position() to 0 on standby
...
Bug: 21199150
Bug: 23080499
Change-Id: I749b331bfce8cfe27b16bb2fce14f23816fb48ce
2015-08-12 23:28:30 +00:00
Chad Brubaker
a3c0ae16ac
Fix benign unsigned overflow
...
On the last check of the conditional param_count-- causes an unsigned
wrap around. This isn't incorrect but does lead to a false positive with
fsanitize unsigned-integer-overflow
Change-Id: If3eb7a9e248d0404a434de2ead70e8c099e84ddf
2015-08-12 12:46:44 -07:00
Glenn Kasten
4fa7add661
am dbceefea
: am aaf2d266
: am 569737c6
: Merge "Add USB out_get_presentation_position() for timestamps" into mnc-dev
...
* commit 'dbceefeab317ec036c484d2c33cfb53c1c2624f6':
Add USB out_get_presentation_position() for timestamps
2015-08-07 17:12:40 +00: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
3b78a2497f
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:47:20 +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
bc7ec00f5e
am aaaebe2a
: am a7897020
: am b3759712
: Implement Bluetooth settings factory reset (4/5)
...
* commit 'aaaebe2aa5efdf5bfba2dd22486994c9bee31816':
Implement Bluetooth settings factory reset (4/5)
2015-08-05 20:35:33 +00: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
ca76ccfaa0
am b3759712
: Implement Bluetooth settings factory reset (4/5)
...
* commit 'b3759712b0ab4ae294731ee5889c2ebd131a156f':
Implement Bluetooth settings factory reset (4/5)
2015-08-05 18:00:51 +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
d1b68b9414
am 993779c3
: am 3f93d2a9
: Merge "libhardware: sensors: update multi hal to support 64bit builds"
...
* commit '993779c3c46016e561a797e13d2560cc6320e6e8':
libhardware: sensors: update multi hal to support 64bit builds
2015-08-04 19:17:00 +00: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
cd003aee3e
am 7da2c5fe
: am 3fabfd8e
: am 929e0a19
: Add better documentation to fingerprint.h
...
* commit '7da2c5fe2a17ad2216a5c6d18561e3932bc741f9':
Add better documentation to fingerprint.h
2015-07-28 23:45:23 +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