Commit graph

1811 commits

Author SHA1 Message Date
Steven Moreland
e44aa092c5 uevent.c: avoid POLLERR infinite loop
I have not reproduced this infinite loop.
An infinite loop may be more useful to debug.

Note, libhardware_legacy AIDL interface dependency
already includes liblog, so this won't change
which libraries are loaded.

Bug: 300009377
Test: N/A
Change-Id: I1f5545456e7074823f0f9df35496cbf5a2a012a4
2024-01-02 23:45:44 +00:00
Nikita Putikhin
c315f49b2e Merge "Check that ISystemSuspend is declared before acquiring a wake lock" into main 2023-12-15 09:47:35 +00:00
Nikita Putikhin
3ff648d5ff Check that ISystemSuspend is declared before acquiring a wake lock
On some systems (Minidroid & friends) there is no suspend-service, which
means that acquiring a wake lock would wait indefinitely. In our case
this prevented `adb bugreport` from working.

With this change if the service is not declared, acquire_wake_lock would
fail, as opposed to getting stuck.

Test: atest libpower_test
Test: block_suspend
  - works on aosp_cf_x86_64_phone-trunk_staging-userdebug
  - fails (expected) on aosp_cf_x86_64_minidroid-trunk_staging-userdebug

Bug: 291070376
Change-Id: Ie25f3d96e457aa7945f36c301e70b751d529e6c7
2023-12-13 12:00:35 +01:00
Xin Li
53f0ce5f59 Merge "Merge Android 14 QPR1" into main 2023-12-09 00:11:53 +00:00
Xin Li
0a80706d87 Merge Android 14 QPR1
Merged-In: I1031deea32ae4c5c3d432a2fceecda86a8158c10
Bug: 315507370
Change-Id: Ibd9c5114d2d6a2bb8fc4f3d326adecb442c054cf
2023-12-08 13:14:16 -08:00
Xin Li
4437a8f9b8 Merge 10952656
Merged-In: Ie8b6f1c69cc35952157ced791ef0743f01b02e4c
Change-Id: I1031deea32ae4c5c3d432a2fceecda86a8158c10
2023-10-17 10:08:43 -07:00
Xin Li
006052478b [automerger skipped] Merge "Merge Android 14" into main am: f900001fa7 -s ours am: b500f4f589 -s ours am: 83a2341ae0 -s ours am: 7544efe6ac -s ours
am skip reason: Merged-In If5cf93ade13d6e650ae305db9933a9f536e3b525 with SHA-1 2c3e53e5dd is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/2776346

Change-Id: Ie8b6f1c69cc35952157ced791ef0743f01b02e4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 11:05:03 +00:00
Xin Li
9d83ae31a0 [automerger skipped] Merge Android 14 am: 7915e04466 -s ours am: 6d2a096b11 -s ours am: 60b25f3ed2 -s ours am: b493b4c758 -s ours
am skip reason: Merged-In If5cf93ade13d6e650ae305db9933a9f536e3b525 with SHA-1 2c3e53e5dd is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/2776346

Change-Id: I9fc55ef12836d932aea0c16453676c37ff697010
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 11:00:16 +00:00
Xin Li
7544efe6ac [automerger skipped] Merge "Merge Android 14" into main am: f900001fa7 -s ours am: b500f4f589 -s ours am: 83a2341ae0 -s ours
am skip reason: Merged-In If5cf93ade13d6e650ae305db9933a9f536e3b525 with SHA-1 2c3e53e5dd is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/2776346

Change-Id: I797228be1ada21811c84721638bcf4c08ecdd5f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 09:55:13 +00:00
Xin Li
b493b4c758 [automerger skipped] Merge Android 14 am: 7915e04466 -s ours am: 6d2a096b11 -s ours am: 60b25f3ed2 -s ours
am skip reason: Merged-In If5cf93ade13d6e650ae305db9933a9f536e3b525 with SHA-1 2c3e53e5dd is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/2776346

Change-Id: Iaa519c3e002a894035a107849b38b44390f05f45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 09:50:26 +00:00
Xin Li
83a2341ae0 [automerger skipped] Merge "Merge Android 14" into main am: f900001fa7 -s ours am: b500f4f589 -s ours
am skip reason: Merged-In If5cf93ade13d6e650ae305db9933a9f536e3b525 with SHA-1 2c3e53e5dd is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/2776346

Change-Id: I1c7edb47bfffb984c88e404f852b11c5c658edac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 09:03:25 +00:00
Xin Li
60b25f3ed2 [automerger skipped] Merge Android 14 am: 7915e04466 -s ours am: 6d2a096b11 -s ours
am skip reason: Merged-In If5cf93ade13d6e650ae305db9933a9f536e3b525 with SHA-1 2c3e53e5dd is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/2776346

Change-Id: I179cb682bd68ec5256b761cb1ce24fa29f8f083b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 08:58:49 +00:00
Xin Li
b500f4f589 [automerger skipped] Merge "Merge Android 14" into main am: f900001fa7 -s ours
am skip reason: Merged-In If5cf93ade13d6e650ae305db9933a9f536e3b525 with SHA-1 2c3e53e5dd is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/2776346

Change-Id: I41d6be47860fa5292aea16ae0be9adce489f9115
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 07:56:34 +00:00
Xin Li
6d2a096b11 [automerger skipped] Merge Android 14 am: 7915e04466 -s ours
am skip reason: Merged-In If5cf93ade13d6e650ae305db9933a9f536e3b525 with SHA-1 2c3e53e5dd is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/2776346

Change-Id: I813f802b38e8d7c324de6b0466ed199c2a237b53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 07:51:45 +00:00
Xin Li
f900001fa7 Merge "Merge Android 14" into main 2023-10-06 05:34:24 +00:00
Xin Li
7915e04466 Merge Android 14
Bug: 298295554
Merged-In: If5cf93ade13d6e650ae305db9933a9f536e3b525
Change-Id: If1d956c1cbd87ba6135deea821b472ac8534d15d
2023-10-05 15:41:03 -07:00
Xin Li
2de650cab9 [automerger skipped] Merge Android U (ab/10368041) am: db48564f25 -s ours am: 637ef2dfcb -s ours am: 65386c7974 -s ours
am skip reason: Merged-In I9849ac965be2dc1ddc4a8ab634cefc2077640105 with SHA-1 ee877f8ab9 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/24182904

Change-Id: I43e877224be9c73e3470164629a0ea8949e5b3fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 01:10:36 +00:00
Xin Li
65386c7974 [automerger skipped] Merge Android U (ab/10368041) am: db48564f25 -s ours am: 637ef2dfcb -s ours
am skip reason: Merged-In I9849ac965be2dc1ddc4a8ab634cefc2077640105 with SHA-1 ee877f8ab9 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/24182904

Change-Id: I35b1786da42a4bbbd1924d899a855cf058f68848
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 00:34:53 +00:00
Xin Li
637ef2dfcb [automerger skipped] Merge Android U (ab/10368041) am: db48564f25 -s ours
am skip reason: Merged-In I9849ac965be2dc1ddc4a8ab634cefc2077640105 with SHA-1 ee877f8ab9 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/24182904

Change-Id: I26d8ce12bd95cea1820bbe1423edfbc7fba602a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 23:58:53 +00:00
Xin Li
db48564f25 Merge Android U (ab/10368041)
Bug: 291102124
Merged-In: I9849ac965be2dc1ddc4a8ab634cefc2077640105
Change-Id: Ibc7c72d1f50be7df2729a5405e500b1090df8d07
2023-08-17 16:51:48 -07:00
Treehugger Robot
0c49564220 Merge "Use String8/16 c_str" into main am: d473ecf232 am: bf039d5d64 am: ffa40701a9 am: 6d585009ec
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/2705615

Change-Id: I1f1bbb7bee35edbbbc255f90c26f6064123aca6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 10:46:25 +00:00
Treehugger Robot
6d585009ec Merge "Use String8/16 c_str" into main am: d473ecf232 am: bf039d5d64 am: ffa40701a9
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/2705615

Change-Id: Ifc2ac8d554522fb9c64f39fc177c710a1f7556a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 10:02:15 +00:00
Treehugger Robot
ffa40701a9 Merge "Use String8/16 c_str" into main am: d473ecf232 am: bf039d5d64
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/2705615

Change-Id: I665bbaa8c28fcfd89b7e8f8eca51b341fbafb129
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 09:12:54 +00:00
Treehugger Robot
bf039d5d64 Merge "Use String8/16 c_str" into main am: d473ecf232
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/2705615

Change-Id: I352ae5970709d455885ec1e53cb8d8c98bb41705
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 08:22:49 +00:00
Treehugger Robot
d473ecf232 Merge "Use String8/16 c_str" into main 2023-08-17 07:25:40 +00:00
Tomasz Wasilczyk
2c3e53e5dd Use String8/16 c_str
Bug: 295394788
Test: make checkbuild
Change-Id: If5cf93ade13d6e650ae305db9933a9f536e3b525
2023-08-11 18:11:12 +00:00
Hsiu-Chang Chen
6f01544b76 Add a new SAR scenario for rear camera active am: 104cefa180 am: 1e526e29f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/23602804

Change-Id: I37f9d0382994461884d8437a145e3333799adc43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-24 04:32:29 +00:00
Hsiu-Chang Chen
f2e66efb53 Add a new SAR scenario for rear camera active am: 104cefa180 am: 8fd7cd77ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/23602804

Change-Id: I5fbc4c1e7ff223167976d01a6a4abeb763d1d45c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-24 04:25:59 +00:00
Hsiu-Chang Chen
1e526e29f9 Add a new SAR scenario for rear camera active am: 104cefa180
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/23602804

Change-Id: I8e39af4fe13054e7a2270090b8aa003ad0b3597f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-24 03:19:31 +00:00
Hsiu-Chang Chen
8fd7cd77ae Add a new SAR scenario for rear camera active am: 104cefa180
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/23602804

Change-Id: Id436951511cbbb283889d2d48e199886b15cbbc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-24 03:14:55 +00:00
Hsiu-Chang Chen
104cefa180 Add a new SAR scenario for rear camera active
Bug: 285609097
Test: Performance teset
Change-Id: I56b830cbb9303cff1ff43eaa753c117a220a962f
2023-06-16 06:54:32 +00:00
Vinay Gannevaram
1879e565c6 Update NAN MAJOR and MINOR version to 4.0.0 am: 787b2cd73a am: 299868492d am: 8b2c0d5bf8
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/23039200

Change-Id: I790681a75d6434c5b8db7d383d2f37e274b235fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 23:53:19 +00:00
Vinay Gannevaram
17a80a3b27 Update NAN MAJOR and MINOR version to 4.0.0 am: 787b2cd73a am: ee877f8ab9 am: fe445908a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/23039200

Change-Id: Ic04ef0950b185f8cccec19f5239ef78fc078c8f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 23:48:47 +00:00
Vinay Gannevaram
33b4613870 Update NAN MAJOR and MINOR version to 4.0.0 am: 787b2cd73a am: 299868492d am: 0a3170fa01
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/23039200

Change-Id: Ic70ad896a60d91e7369e86f987e9a45f45210de8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 23:47:39 +00:00
Vinay Gannevaram
fe445908a0 Update NAN MAJOR and MINOR version to 4.0.0 am: 787b2cd73a am: ee877f8ab9
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/23039200

Change-Id: Iec37ed8bd7dc4714805a6617a004ddcfe1c098e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 23:31:27 +00:00
Vinay Gannevaram
8b2c0d5bf8 Update NAN MAJOR and MINOR version to 4.0.0 am: 787b2cd73a am: 299868492d
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/23039200

Change-Id: I8f95a7d6a418969da2f392385f3e51a9f9291012
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 23:10:02 +00:00
Vinay Gannevaram
0a3170fa01 Update NAN MAJOR and MINOR version to 4.0.0 am: 787b2cd73a am: 299868492d
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/23039200

Change-Id: Iff1b9510a6577d4b8d7dd89626b92cdeebc028e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 23:05:57 +00:00
Vinay Gannevaram
299868492d Update NAN MAJOR and MINOR version to 4.0.0 am: 787b2cd73a
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/23039200

Change-Id: Icb57bb87efe7f4dac654345b82a551209ecba9cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 22:25:22 +00:00
Vinay Gannevaram
ee877f8ab9 Update NAN MAJOR and MINOR version to 4.0.0 am: 787b2cd73a
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/23039200

Change-Id: I9849ac965be2dc1ddc4a8ab634cefc2077640105
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 22:20:58 +00:00
Vinay Gannevaram
787b2cd73a Update NAN MAJOR and MINOR version to 4.0.0
As NAN interface supports the functionality of WiFi-Aware 4.0
specification, update MAJOR and MINOR version accordingly

Bug: 280415518
Test: TH
Change-Id: I29c80311ba5447aebeba9d455d81293f23c20a1d
2023-05-04 13:57:26 -07:00
Vinay Gannevaram
f48532f5df Interface changes for Aware 4.0 Bootsrapping and Shared Key am: d1de22e90f am: 37993e4500 am: f301888e1f
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/22898651

Change-Id: Ic6fcbfb10051dfa29074c3feab1ed1f6fb365a61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 00:56:52 +00:00
Vinay Gannevaram
8c21535541 Interface changes for Aware 4.0 Bootsrapping and Shared Key am: d1de22e90f am: 73cfea07e4 am: 12c385002a
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/22898651

Change-Id: Ia1e2a129f4afd57d88b77f80fb3cf15f6fd63812
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 00:53:29 +00:00
Vinay Gannevaram
f74a02a895 Interface changes for Aware 4.0 Bootsrapping and Shared Key am: d1de22e90f am: 73cfea07e4 am: 52c2402f19
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/22898651

Change-Id: Iccc9501ba3641805a890c9e2ccac9c69eb136f73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 00:51:15 +00:00
Vinay Gannevaram
f301888e1f Interface changes for Aware 4.0 Bootsrapping and Shared Key am: d1de22e90f am: 37993e4500
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/22898651

Change-Id: Ie7ec6208e462e9c3286c4a9286484a921ed0674d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 00:19:11 +00:00
Vinay Gannevaram
12c385002a Interface changes for Aware 4.0 Bootsrapping and Shared Key am: d1de22e90f am: 73cfea07e4
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/22898651

Change-Id: I7ff4d15856142531cd6142d975db14e7e241636b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 00:09:37 +00:00
Vinay Gannevaram
52c2402f19 Interface changes for Aware 4.0 Bootsrapping and Shared Key am: d1de22e90f am: 73cfea07e4
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/22898651

Change-Id: Iceb29b77ba8d48d88127cadeb97d60fd4660d978
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 00:07:28 +00:00
Vinay Gannevaram
73cfea07e4 Interface changes for Aware 4.0 Bootsrapping and Shared Key am: d1de22e90f
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/22898651

Change-Id: I9b701924570860babbf32d09a212309140ac2eaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-01 23:34:49 +00:00
Vinay Gannevaram
37993e4500 Interface changes for Aware 4.0 Bootsrapping and Shared Key am: d1de22e90f
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/22898651

Change-Id: I8fee545e6de4fea327056ec4dfc8a41203e323ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-01 23:01:39 +00:00
Vinay Gannevaram
d1de22e90f Interface changes for Aware 4.0 Bootsrapping and Shared Key
Some methods like service managed bootstrapping required SDEA attribute to
carry service specific information during bootstrapping handshake. Also
once Pairing is setup User can transmit follow up frames to share NIK to the
peer which should carry shared key descriptor. Comeback timeout can be set by
Bootstrapping responder to defer the ongoing handshake.
Hence Add interface changes for above requirements.

Bug: 279363671
Test: build, flash and CtsWifiTestCases
Change-Id: I67c4e5283189cfc80ef86b610d9d7f021ff4b29b
2023-04-26 17:03:13 -07:00
Nate Jiang
2b3c3a49bf NAN R4 additional iface changes for WFA certification
Bug: 269440402
Test: build
Change-Id: Ieaa28d5a5b71ca755f06b72c24fa8090179eeb4a
2023-02-21 21:48:40 +00:00