Commit graph

5310 commits

Author SHA1 Message Date
Xin Li
1d4cade478 Merge Android R
Bug: 168057903
Merged-In: Ib50a9978c77eda7e20e27f2d63615599f0517b6d
Change-Id: I7cefed0e9b2048b48227da4a2043658ef231a56e
2020-09-08 16:55:29 -07:00
Xin Li
fae361f24e Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
Bug: 166295507
Merged-In: I500b53e89f132b3925e6a1912c75b7834ea47ff4
Change-Id: Ib50a9978c77eda7e20e27f2d63615599f0517b6d
2020-08-27 10:16:42 -07:00
Christopher Ferris
36bca0314d Merge "Update codeMap for v5.8 kernel update." am: a1a6f9e819
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1388971

Change-Id: I8223f390579ecaae7fd39e416f728b71b62ccfdd
2020-08-06 16:49:00 +00:00
Christopher Ferris
a1a6f9e819 Merge "Update codeMap for v5.8 kernel update." 2020-08-06 16:31:03 +00:00
Christopher Ferris
82dca31ec3 Update codeMap for v5.8 kernel update.
This also allows the previous kernels to still use the previous values.

Test: Builds and boots.
Change-Id: I12b5a5f15d198de642e8582bc2320fe6b1409bcf
2020-08-05 13:27:47 -07:00
Victor Khimenko
0d57727f5a Make libhardware_headers available for native_bridge am: 8abec648ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/12128050

Change-Id: I500b53e89f132b3925e6a1912c75b7834ea47ff4
2020-07-14 17:25:43 +00:00
Victor Khimenko
8abec648ca Make libhardware_headers available for native_bridge
Bug: http://b/153609531

Test: m libRSDriver.native_bridge

Change-Id: I05220635027635ff12a7d5201b5c716ca4fda5ea
2020-07-10 20:18:51 +02:00
Victor Khimenko
ccfd96793c Merge "Make libhardware_headers available for native_bridge" am: bbdbd7856a am: de182688ba
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1353604

Change-Id: I74bda8a955242d75ac2b1ebf73e5e702a5ade38a
2020-07-01 00:43:17 +00:00
Victor Khimenko
de182688ba Merge "Make libhardware_headers available for native_bridge" am: bbdbd7856a
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1353604

Change-Id: I5f2371321e7695bf8384e13a54ba59db3aa505df
2020-07-01 00:30:25 +00:00
Victor Khimenko
bbdbd7856a Merge "Make libhardware_headers available for native_bridge" 2020-07-01 00:16:16 +00:00
Victor Khimenko
e22d90cc0a Make libhardware_headers available for native_bridge
Bug: http://b/153609531

Test: m libRSDriver.native_bridge

Change-Id: I05220635027635ff12a7d5201b5c716ca4fda5ea
2020-06-30 22:56:22 +02:00
Andy Hung
bb2bf2d62d Merge "audio_alsaops: fix format conversion error handling bug" am: 9a2cf9a818 am: 53ead60966
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1323975

Change-Id: If3b86f025a61e3151da8e45c6dac1d221c8f3a5c
2020-06-08 17:17:51 +00:00
Andy Hung
53ead60966 Merge "audio_alsaops: fix format conversion error handling bug" am: 9a2cf9a818
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1323975

Change-Id: I66657c8c7cb3fe986e52738f4a9119cdcc374423
2020-06-08 17:02:14 +00:00
Andy Hung
9a2cf9a818 Merge "audio_alsaops: fix format conversion error handling bug" 2020-06-08 16:39:07 +00:00
Jindong
8681eabddf audio_alsaops: fix format conversion error handling bug
Returns a invalid format after fatal error,
instead of "0", which equals to PCM_FORMAT_S16_LE or
AUDIO_FORMAT_DEFAULT.

Also fix below build error:
hardware/libhardware/include/hardware/audio_alsaops.h:63:16:
error: cannot initialize return object of type 'enum pcm_format' with an rvalue of type 'int'
        return 0;
hardware/libhardware/include/hardware/audio_alsaops.h:97:16:
error: cannot initialize return object of type 'audio_format_t' with an rvalue of type 'int'
        return 0;

Signed-off-by: Jindong <jindong.yue@nxp.com>
Change-Id: Iabf5ae106d9c371c00ad5236326c6f38d1a9f116
2020-06-05 11:11:07 +08:00
Orion Hodson
0c62e87a9e Merge "Add jni_headers to libinput_evdev" am: 93b6bed67a am: 76f174cfe4
Change-Id: I022224e6e2652ba10e3a849de3836e107c7adb13
2020-06-01 09:58:43 +00:00
Orion Hodson
76f174cfe4 Merge "Add jni_headers to libinput_evdev" am: 93b6bed67a
Change-Id: I27369268037d76af4a12d966fc5b98a6589efcfd
2020-06-01 09:39:14 +00:00
Orion Hodson
93b6bed67a Merge "Add jni_headers to libinput_evdev" 2020-06-01 09:20:10 +00:00
Orion Hodson
2bc7bf0b34 Add jni_headers to libinput_evdev
Preparation for removing implicit include paths for jni.h from soong.

Bug: 152482542
Test: apply soong change and 'm checkbuild'
Change-Id: I0a021d293f53fdb78b37452b5aa873d809e6ca81
Merged-In: I0a021d293f53fdb78b37452b5aa873d809e6ca81
Exempt-From-Owner-Approval: build clean-up
(cherry picked from commit a49fa1c8a9)
2020-05-27 16:54:12 +01:00
Treehugger Robot
1680673df5 Merge "Add host_supported to libhardware_headers." am: 6df12d701d am: c2ff947801
Change-Id: I84dc7f4cb82fb53f3690117fdf14beee663b583b
2020-05-08 23:24:37 +00:00
Treehugger Robot
c2ff947801 Merge "Add host_supported to libhardware_headers." am: 6df12d701d
Change-Id: I7e0f4fc9d8f5178fa129a8ef2c655ce5a465cd0c
2020-05-08 23:12:20 +00:00
Treehugger Robot
6df12d701d Merge "Add host_supported to libhardware_headers." 2020-05-08 23:00:48 +00:00
Treehugger Robot
732eb68c81 Merge "Add METADATA to libhardware: Apache2+BSD is NOTICE" am: 76ce69fa2e am: 54ce8ec356
Change-Id: Ie5962de714c2446efe4f499b83520939483cf376
2020-05-04 17:39:18 +00:00
Treehugger Robot
54ce8ec356 Merge "Add METADATA to libhardware: Apache2+BSD is NOTICE" am: 76ce69fa2e
Change-Id: Ie683336a9c6d3c30097ffe586c3754e5eb05ae29
2020-05-04 17:22:37 +00:00
Treehugger Robot
76ce69fa2e Merge "Add METADATA to libhardware: Apache2+BSD is NOTICE" 2020-05-04 16:59:02 +00:00
A. Cody Schuffelen
e8ee2fcbae Add host_supported to libhardware_headers.
This will allow building PureSoftKeymaster on the host.

Bug: 155328339
Test: Compiles
Change-Id: If4474fc3da715a49f2c8649a61968cdda9b1086f
2020-04-29 14:46:38 -07:00
Bob Badour
94e877b9d1 Add METADATA to libhardware: Apache2+BSD is NOTICE
Bug: 68860345
Bug: 69058154
Bug: 151953481

Test: no code changes
Change-Id: Ia73e4b7eb36054a000f008b81ea60ad3077b05e4
2020-04-27 20:35:52 -07:00
Jooyung Han
2c0cb49e13 [automerger skipped] Set min_sdk_version to be part of mainline modules am: a3a52f6dfe -s ours
am skip reason: Change-Id Iab1437027fcbe4b7876207ec7605a765ba667b52 with SHA-1 b1e43a9005 is in history

Change-Id: I36588f7aabbd228b5f1182e321f6d4cd14aa36a6
2020-04-27 18:35:01 +00:00
Jooyung Han
a3a52f6dfe Set min_sdk_version to be part of mainline modules
Modules contributing mainline modules (APK/APEX) should set
min_sdk_version as well as apex_available.

For now setting min_sdk_version doesn't change build outputs.
But build-time checks will be added soon.

Bug: 152655956
Test: m
Merged-In: Iab1437027fcbe4b7876207ec7605a765ba667b52
Change-Id: Iab1437027fcbe4b7876207ec7605a765ba667b52
(cherry picked from commit b1e43a9005)
2020-04-27 18:04:21 +09:00
Jooyung Han
c5bdfbdf70 Merge "Set min_sdk_version to be part of mainline modules" am: 85d76c04ae am: 5410eff757
Change-Id: I368d429c4aa6c8c0a398b877add982ce36a3c76b
2020-04-23 03:56:06 +00:00
Jooyung Han
5410eff757 Merge "Set min_sdk_version to be part of mainline modules" am: 85d76c04ae
Change-Id: Ib7f330fdeb4a8f7d31d0b862fd3dabd8d30826bf
2020-04-23 03:42:28 +00:00
Jooyung Han
85d76c04ae Merge "Set min_sdk_version to be part of mainline modules" 2020-04-23 03:22:22 +00:00
Jooyung Han
b1e43a9005 Set min_sdk_version to be part of mainline modules
Modules contributing mainline modules (APK/APEX) should set
min_sdk_version as well as apex_available.

For now setting min_sdk_version doesn't change build outputs.
But build-time checks will be added soon.

Bug: 152655956
Test: m
Change-Id: Iab1437027fcbe4b7876207ec7605a765ba667b52
2020-04-16 18:48:32 +09:00
Xin Li
57f5e9b0fa [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 11d99f5276 -s ours
am skip reason: subject contains skip directive

Change-Id: I5b8a4c4ea119af396abc5854d93853a771a2ddee
2020-04-10 03:12:43 +00:00
Xin Li
11d99f5276 DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master
Bug: 151763422
Change-Id: I467045eb6fd9e04866c20618e6134e810593707a
2020-04-09 17:51:09 -07:00
Treehugger Robot
916ac81280 Merge "audio remote submix: fix write blocked on input standby" am: 8705f278a3 am: e2ce03b586
Change-Id: I001508c27fb44f469416298fb45a9a0c34e91d44
2020-03-29 02:13:29 +00:00
Treehugger Robot
11786054ea [automerger skipped] Merge "audio remote submix: fix write blocked on input standby" am: 8705f278a3 am: e2ce03b586 -s ours
am skip reason: Change-Id Ie92d59529ac1018a6785c3ac31696dcccdbb204a with SHA-1 7788716bde is in history

Change-Id: Ib0d15ee3c12dbcd6f6ae4db9c41ae4023b250b58
2020-03-29 02:13:28 +00:00
Treehugger Robot
e2ce03b586 Merge "audio remote submix: fix write blocked on input standby" am: 8705f278a3
Change-Id: I7b3edc2e7e6591af49d3ffb3938c7b2396ade48e
2020-03-29 02:02:20 +00:00
Treehugger Robot
8705f278a3 Merge "audio remote submix: fix write blocked on input standby" 2020-03-29 01:34:58 +00:00
Mikhail Naganov
0f02e5c3af usbaudio: Add missing 'return' on error am: 1d08a56cff
Change-Id: Id0c40d48b9c8e345913eba80cb8c004fa8c698d4
2020-03-27 02:19:47 +00:00
Mikhail Naganov
1d08a56cff usbaudio: Add missing 'return' on error
Code in adev_open_input_stream was deallocating
a structure but then using it again due to absence
of a 'return' statement.
Found by clang-tidy.

Bug: 152526318
Test: m
Change-Id: I9ec3148197715fb118e99503d2b52412a4fb2a73
2020-03-26 13:18:12 -07:00
Eric Laurent
8349affbf8 audio remote submix: fix write blocked on input standby
Do not block in out_write() when the peer input is in standby to avoid
remaining stuck when writing to the blocking mono pipe.

Bug: 141878993
Test: atest AudioHostTest#testTwoChannelCapturing

Change-Id: Ie92d59529ac1018a6785c3ac31696dcccdbb204a
Merged-In: Ie92d59529ac1018a6785c3ac31696dcccdbb204a
2020-03-23 17:34:47 -07:00
Xin Li
6b4c81ff42 DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: cb9293b3de
Change-Id: I639095e598396e4157ecf1f1a4de056da9a0ca6d
2020-03-19 06:01:31 +00:00
Xin Li
8113b6d7df [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: cb9293b3de -s ours
am skip reason: subject contains skip directive

Change-Id: I0e37dbddf8cea0ed734036b43fec4cc33b4835bd
2020-03-19 06:01:18 +00:00
Xin Li
cb9293b3de DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master
Bug: 151763422
Change-Id: Iadd974705b931ff72e2e2222a092ed83d068ce59
2020-03-18 19:40:47 -07:00
Automerger Merge Worker
c71e502f12 [automerger skipped] Added identity credential key to keymaster tag set. am: de4d82fc16 -s ours
am skip reason: Change-Id I5a0336692f894580a46d6e70a5b2e2b6d54508e5 with SHA-1 79a5bd607d is in history

Change-Id: Ib805862e9855121ae6d1f0ca3f1bc55536cdb442
2020-03-09 20:31:51 +00:00
Selene Huang
de4d82fc16 Added identity credential key to keymaster tag set.
Bug: 149908474

Test: atest android.security.identity.cts.AttestationTest
Test: atest VtsHalIdentityCredentialTarge
Merged-In: I5a0336692f894580a46d6e70a5b2e2b6d54508e5
Change-Id: I4c1cf2cc5112ccae2151958c65025d9e225bdeed
2020-03-09 12:28:05 -04:00
Automerger Merge Worker
c320973058 Add a callback for codec format changed. am: 3b4b33f479
Change-Id: Idb2e22016e4a58cc1315d8f1355830512fb58ffb
2020-02-26 18:54:15 +00:00
Automerger Merge Worker
0f30f984e8 Merge "Added identity credential key to keymaster tag set." am: 0f6a221b62 am: 353924555e
Change-Id: I8b9be13d5928f2a9221c08a5801b8a3b4f7f4fe0
2020-02-25 21:41:46 +00:00
Automerger Merge Worker
868e69a2aa Merge "Added identity credential key to keymaster tag set." am: 0f6a221b62 am: 353924555e
Change-Id: I3d3dbcf2efe21edabb63d7e071f54920e993683a
2020-02-25 21:41:33 +00:00