Yifan Hong
738df72fc7
Merge "Allow batteryChargeTimeToFullNowSeconds to be -1" am: 4e2d45ba53
am: 0d35a17357
am: 0a09e17cc1
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1436094
Change-Id: Ic6f5360566681967bfb589340ce85789d5534ecb
2020-09-24 18:58:39 +00:00
Yifan Hong
0a09e17cc1
Merge "Allow batteryChargeTimeToFullNowSeconds to be -1" am: 4e2d45ba53
am: 0d35a17357
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1436094
Change-Id: If1dd391e0b7d83bae6cedea04ff40df126e53d66
2020-09-24 18:38:52 +00:00
Yifan Hong
0d35a17357
Merge "Allow batteryChargeTimeToFullNowSeconds to be -1" am: 4e2d45ba53
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1436094
Change-Id: I9ceb70387f9ddad43a1443c63fda707a7f7e253c
2020-09-24 17:50:52 +00:00
Yifan Hong
4e2d45ba53
Merge "Allow batteryChargeTimeToFullNowSeconds to be -1"
2020-09-24 17:30:37 +00:00
Stephane Lee
c2dc510a0a
Allow batteryChargeTimeToFullNowSeconds to be -1
...
Test: Run the test under an implementation that doesn't support
batteryChargeTimeToFullNowSeconds
Bug: 166841711
Change-Id: I18fb11bb0a2233a9a89183a5f9ecf597e7719172
2020-09-23 14:27:53 -07:00
Devin Moore
022d9abfae
Merge changes from topic "revert-1433252-revert-1431616-thirtytwo-QKCUUIXLZL-QJYJJALHBY" am: 51dc008bd3
am: 359970caaf
am: e30e9d9d67
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1434354
Change-Id: I3e86b3e9cdd6794882ce4e83a20a801abca8ae70
2020-09-22 21:31:57 +00:00
Devin Moore
7178223c75
Reland "Change HIDL fmq tests to use int32_t for payload" am: 7a26802481
am: 8980ac3b5f
am: 99ace1c2f4
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1434353
Change-Id: Idc5099535d2962e06988c8181e04fce1c401ae30
2020-09-22 21:31:55 +00:00
Devin Moore
e30e9d9d67
Merge changes from topic "revert-1433252-revert-1431616-thirtytwo-QKCUUIXLZL-QJYJJALHBY" am: 51dc008bd3
am: 359970caaf
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1434354
Change-Id: I210c10e0c63e46ae4cf8c0d16b20c970c9768395
2020-09-22 21:14:39 +00:00
Devin Moore
99ace1c2f4
Reland "Change HIDL fmq tests to use int32_t for payload" am: 7a26802481
am: 8980ac3b5f
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1434353
Change-Id: I339aa773c01927f7f2d559eb7bd34ce6091b4170
2020-09-22 21:14:37 +00:00
Devin Moore
359970caaf
Merge changes from topic "revert-1433252-revert-1431616-thirtytwo-QKCUUIXLZL-QJYJJALHBY" am: 51dc008bd3
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1434354
Change-Id: I7888a9c5d291d84ff87c248cf45ab49f98fa2987
2020-09-22 20:53:25 +00:00
Devin Moore
8980ac3b5f
Reland "Change HIDL fmq tests to use int32_t for payload" am: 7a26802481
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1434353
Change-Id: Ic2ef85618e3cb4bacda1bf98e9516b59b4e80a66
2020-09-22 20:52:57 +00:00
Devin Moore
51dc008bd3
Merge changes from topic "revert-1433252-revert-1431616-thirtytwo-QKCUUIXLZL-QJYJJALHBY"
...
* changes:
Reland "Add template parameters to MQDescriptor"
Reland "Change HIDL fmq tests to use int32_t for payload"
2020-09-22 20:06:31 +00:00
Devin Moore
dd61a8901d
Reland "Add template parameters to MQDescriptor"
...
b26628ac32
Bug: 142326204
Change-Id: I78d08f84231ca19905f51b0520ede1b71df34365
2020-09-22 17:33:14 +00:00
Devin Moore
7a26802481
Reland "Change HIDL fmq tests to use int32_t for payload"
...
9719e2d984
Bug: 142326204
Change-Id: I0914f7612bcd227f9a4cabbe2818de7d9999a3d3
2020-09-22 17:32:22 +00:00
Treehugger Robot
fb6044b481
Merge "remove 4.14 kernels for Android S" am: 2b3810aa3a
am: 00d3339fb5
am: 37bd8ef94f
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1431736
Change-Id: I59f2919cbb48b1a6aa9d4c518305b3737c17e7b2
2020-09-22 00:32:29 +00:00
Treehugger Robot
37bd8ef94f
Merge "remove 4.14 kernels for Android S" am: 2b3810aa3a
am: 00d3339fb5
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1431736
Change-Id: I18fd793b278792d3682c8036db7546b7aa1d6e48
2020-09-22 00:06:59 +00:00
Treehugger Robot
00d3339fb5
Merge "remove 4.14 kernels for Android S" am: 2b3810aa3a
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1431736
Change-Id: Ie2c8d3ac94f3cf3c035cc673030f22367f306fa6
2020-09-21 23:08:45 +00:00
Yifan Hong
a2f2aeef75
Merge "Add TV CEC to Q+ compatibility matrices." am: 4b7cc14a88
am: aff3512c24
am: 2206232c05
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1429914
Change-Id: I7a06ff8a82e9d076ba42694519058dcffbf48ebc
2020-09-21 22:35:12 +00:00
Treehugger Robot
2b3810aa3a
Merge "remove 4.14 kernels for Android S"
2020-09-21 22:33:56 +00:00
Yifan Hong
2206232c05
Merge "Add TV CEC to Q+ compatibility matrices." am: 4b7cc14a88
am: aff3512c24
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1429914
Change-Id: I18c7600050c5ba37e508071f13a5b9cbb9114b53
2020-09-21 21:47:45 +00:00
Diego Wilson
efb41275bd
Merge changes from topic "revert-1431616-thirtytwo-QKCUUIXLZL" am: 4737502679
am: 7fe9553d96
am: 786b335242
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1433255
Change-Id: Ibe7289d478056b15263d013310b8ba11a498c751
2020-09-21 21:27:50 +00:00
Yifan Hong
aff3512c24
Merge "Add TV CEC to Q+ compatibility matrices." am: 4b7cc14a88
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1429914
Change-Id: Ia5f5808a6c633403fc8b503e977cddf343434c39
2020-09-21 21:26:24 +00:00
Diego Wilson
786b335242
Merge changes from topic "revert-1431616-thirtytwo-QKCUUIXLZL" am: 4737502679
am: 7fe9553d96
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1433255
Change-Id: I00277fded511292958e0f0cdb45f9b94a989c7db
2020-09-21 21:00:09 +00:00
Steve Muckle
5eb1a2c121
remove 4.14 kernels for Android S
...
Android S will not support 4.14 on launch devices.
Bug: 168921549
Change-Id: Ia3c3d1481919a9534c84ad41f307742d0d29587e
2020-09-21 13:38:14 -07:00
Yifan Hong
4b7cc14a88
Merge "Add TV CEC to Q+ compatibility matrices."
2020-09-21 20:28:30 +00:00
Diego Wilson
7fe9553d96
Merge changes from topic "revert-1431616-thirtytwo-QKCUUIXLZL" am: 4737502679
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1433255
Change-Id: I498f1856c8d44c8c326b0118f3ebd8cc6483cf2b
2020-09-21 20:03:48 +00:00
Diego Wilson
4737502679
Merge changes from topic "revert-1431616-thirtytwo-QKCUUIXLZL"
...
* changes:
Revert "Change HIDL fmq tests to use int32_t for payload"
Revert "Add template parameters to MQDescriptor"
2020-09-21 19:44:34 +00:00
Diego Wilson
9719e2d984
Revert "Change HIDL fmq tests to use int32_t for payload"
...
Revert "Change payload type to int32_t for fmq device tests"
Revert submission 1431616-thirtytwo
Reason for revert: This topic broke the aosp_x86-userdebug target. Details at http://b/169077648
Reverted Changes:
If736389eb:Add template parameters to MQDescriptor
Ice9c28c3d:Change HIDL fmq tests to use int32_t for payload
Ia18d8459b:Add template arguments to MQDescriptor for AIDL
I95586cc83:Change payload type to int32_t for fmq device test...
Change-Id: Iaf37a5dca7a915f098e49ecb076c0932eb60e0c3
2020-09-21 19:36:49 +00:00
Diego Wilson
b26628ac32
Revert "Add template parameters to MQDescriptor"
...
Revert "Change payload type to int32_t for fmq device tests"
Revert submission 1431616-thirtytwo
Reason for revert: This topic broke the aosp_x86-userdebug target. Details at http://b/169077648
Reverted Changes:
If736389eb:Add template parameters to MQDescriptor
Ice9c28c3d:Change HIDL fmq tests to use int32_t for payload
Ia18d8459b:Add template arguments to MQDescriptor for AIDL
I95586cc83:Change payload type to int32_t for fmq device test...
Change-Id: Ib7c409b164c76517d642a415cdfc2406e4f2f351
2020-09-21 19:36:49 +00:00
Devin Moore
3519518dc1
Merge changes from topic "thirtytwo" am: ab05f6310d
am: 327be8c123
am: 99097b0f72
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1431700
Change-Id: Iea6c5ec5389cac49940b75bae9e66dfa50a612b7
2020-09-21 17:31:43 +00:00
Devin Moore
913bfbf823
Change HIDL fmq tests to use int32_t for payload am: 0a10d6918c
am: 606d2ec362
am: 5b1514cb70
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1431692
Change-Id: I42c80aa8cd2e182167ac3e930f573b31045d6118
2020-09-21 17:31:40 +00:00
Devin Moore
99097b0f72
Merge changes from topic "thirtytwo" am: ab05f6310d
am: 327be8c123
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1431700
Change-Id: I030e7bca3384577dc4b8faa0cd26477c3835cc15
2020-09-21 17:09:45 +00:00
Devin Moore
5b1514cb70
Change HIDL fmq tests to use int32_t for payload am: 0a10d6918c
am: 606d2ec362
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1431692
Change-Id: Ide560d85c648e2b52410cb4aabf8665e7b5311c0
2020-09-21 17:09:43 +00:00
Devin Moore
327be8c123
Merge changes from topic "thirtytwo" am: ab05f6310d
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1431700
Change-Id: I4fb548eb4997daeb03999dacd71ea2e073c472fc
2020-09-21 16:50:46 +00:00
Devin Moore
606d2ec362
Change HIDL fmq tests to use int32_t for payload am: 0a10d6918c
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1431692
Change-Id: I3c0aa7c8dacfd68978eb71617b20df97d12706be
2020-09-21 16:50:09 +00:00
Devin Moore
ab05f6310d
Merge changes from topic "thirtytwo"
...
* changes:
Add template parameters to MQDescriptor
Change HIDL fmq tests to use int32_t for payload
2020-09-21 16:18:51 +00:00
Bill Yi
0b4150b8a4
[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 7a7e6e5ace
am: 700ea48cb9
-s ours am: e5d83604e4
-s ours
...
am skip reason: Change-Id I115103a3400648975f1ec13f1616cc05ef205679 with SHA-1 a1fade51b7
is in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1429921
Change-Id: I376296eadeb06892b15fdc4b910486f5e20ab11c
2020-09-19 07:01:30 +00:00
Bill Yi
f939f3c833
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: da6ac34b4c
am: e19854ca4c
-s ours am: be54ee14d4
-s ours
...
am skip reason: Change-Id I115103a3400648975f1ec13f1616cc05ef205679 with SHA-1 a1fade51b7
is in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1429921
Change-Id: Ia8ae02ea4b014d6935a58baa79233509b9e7d692
2020-09-19 07:01:02 +00:00
Bill Yi
e5d83604e4
[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 7a7e6e5ace
am: 700ea48cb9
-s ours
...
am skip reason: Change-Id I115103a3400648975f1ec13f1616cc05ef205679 with SHA-1 a1fade51b7
is in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1429921
Change-Id: I4eaeeb21000083f14aac4b750b12bc8c13b388eb
2020-09-19 05:51:36 +00:00
Bill Yi
be54ee14d4
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: da6ac34b4c
am: e19854ca4c
-s ours
...
am skip reason: Change-Id I115103a3400648975f1ec13f1616cc05ef205679 with SHA-1 a1fade51b7
is in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1429921
Change-Id: Ibc933fe71e7fcdce2cae9fc19017810caa78a79c
2020-09-19 05:50:39 +00:00
Bill Yi
700ea48cb9
Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 7a7e6e5ace
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1429921
Change-Id: Icf2e7b0f8668fbf0c928a023bc9ed0690f61b295
2020-09-19 05:24:18 +00:00
Bill Yi
e19854ca4c
Merge mainline-release 6664920 to master - DO NOT MERGE am: da6ac34b4c
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1429921
Change-Id: I1f7c50d9bf05fb576e5f7aaee02bfb14995db90a
2020-09-19 05:22:48 +00:00
Bill Yi
7a7e6e5ace
Merge "Merge mainline-release 6664920 to master - DO NOT MERGE"
2020-09-18 18:47:48 +00:00
Devin Moore
340f895d30
Add template parameters to MQDescriptor
...
First parameter is used to determine the type of the payload, and the
second parameter is used to determine the type of queue.
Added two types to be use in that second parameter.
SynchronizedReadWrite and UnsynchronizedWrite.
Test: atest fmq_unit_tests fmq_test
Bug: 142326204
Change-Id: If736389ebecd02b87879850714606523e5145579
2020-09-18 10:55:15 -07:00
Treehugger Robot
12069ba334
Merge "camera vts: fix CameraHidlTest::isSecureOnly for HAL1 Device" am: d56db87577
am: 83a6256f38
am: ed6abddaf8
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1428451
Change-Id: I884143be08a9ac914836d896597ba6db63fdf8d9
2020-09-18 17:20:18 +00:00
Treehugger Robot
ed6abddaf8
Merge "camera vts: fix CameraHidlTest::isSecureOnly for HAL1 Device" am: d56db87577
am: 83a6256f38
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1428451
Change-Id: I2aa2077cffbbee18a0cd25acb46c3a8e0c4b6f14
2020-09-18 16:31:22 +00:00
Devin Moore
0a10d6918c
Change HIDL fmq tests to use int32_t for payload
...
This is in preperation for more AIDL fmq testing. The types need to be
the same and AIDL does not support unit16_t.
Test: atest fmq_test fmq_unit_tests
Bug: 142326204
Change-Id: Ice9c28c3d0df064ea43c31950b3438d2e0d19063
2020-09-18 09:29:01 -07:00
Treehugger Robot
83a6256f38
Merge "camera vts: fix CameraHidlTest::isSecureOnly for HAL1 Device" am: d56db87577
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1428451
Change-Id: I5f911153e314d0c81c4abc806a57a91c440260c7
2020-09-18 16:03:25 +00:00
Treehugger Robot
d56db87577
Merge "camera vts: fix CameraHidlTest::isSecureOnly for HAL1 Device"
2020-09-18 15:19:25 +00:00
Bill Yi
da6ac34b4c
Merge mainline-release 6664920 to master - DO NOT MERGE
...
Merged-In: I115103a3400648975f1ec13f1616cc05ef205679
Change-Id: I853d3172cf4703b56bfce403d5018c403b38abef
2020-09-17 21:57:06 -07:00