Xin Li
ce05f25ef5
[automerger skipped] Merge Android 12L am: d36a4710b1
-s ours
...
am skip reason: Merged-In I08d1df9ce847a1973d75e21bee7103cc77132baf with SHA-1 6253979ff6
is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/2011694
Change-Id: I2bd5775f35e41551461bad7eb7017239cfaa50bb
2022-03-08 10:19:05 +00:00
Xin Li
d36a4710b1
Merge Android 12L
...
Bug: 222710654
Merged-In: I08d1df9ce847a1973d75e21bee7103cc77132baf
Change-Id: I6e4e8ccfddd50c430ef1dfdbbc4b1d447753fcf7
2022-03-08 00:18:39 +00:00
Bob Badour
6253979ff6
Merge "Declare license metadata for copied files." am: 0725d206fa
...
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/1984823
Change-Id: I08d1df9ce847a1973d75e21bee7103cc77132baf
2022-02-15 03:06:11 +00:00
Bob Badour
0725d206fa
Merge "Declare license metadata for copied files."
2022-02-15 02:30:12 +00:00
Bob Badour
2c199ab96e
Declare license metadata for copied files.
...
Bug: 151177513
Test: m all dist reportmissinglicenses
Change-Id: Ia6f96edd7aea0b726bc0643b4a4c7c2ce9fe127b
2022-02-13 17:16:51 -08:00
Xin Li
d65087bcaf
Merge sc-v2-dev-plus-aosp-without-vendor@8084891
...
Bug: 214455710
Merged-In: I99947e7fc58b5f6ab7d75f2af63b6bf9384917c3
Change-Id: I2a497f8cd91f0a67b10d35ecfb51becebedb7311
2022-02-11 06:57:38 +00:00
Xin Li
0ed1edd8d4
[automerger skipped] Merge "Merge Android 12" am: 5282db2a81
-s ours am: a954bc4fe0
-s ours am: 45c9cb51ce
-s ours am: e2555413d1
-s ours
...
am skip reason: Merged-In I63befde52711ce60502d5ddfcb47e6f1faddbad0 with SHA-1 27b19b918b
is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/1847662
Change-Id: Ieaaa64aa67b8efa10166a1e4c2ba9ca7502b6e01
2021-10-08 08:29:24 +00:00
Xin Li
e2555413d1
[automerger skipped] Merge "Merge Android 12" am: 5282db2a81
-s ours am: a954bc4fe0
-s ours am: 45c9cb51ce
-s ours
...
am skip reason: Merged-In I63befde52711ce60502d5ddfcb47e6f1faddbad0 with SHA-1 27b19b918b
is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/1847662
Change-Id: If487827dc94bd27296fbcef48fa98bcab80cc831
2021-10-08 07:56:26 +00:00
Xin Li
45c9cb51ce
[automerger skipped] Merge "Merge Android 12" am: 5282db2a81
-s ours am: a954bc4fe0
-s ours
...
am skip reason: Merged-In I63befde52711ce60502d5ddfcb47e6f1faddbad0 with SHA-1 27b19b918b
is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/1847662
Change-Id: Ia5340359b4dbb5916ce611ad9a50a3cc36d241cd
2021-10-08 01:39:10 +00:00
Xin Li
a954bc4fe0
[automerger skipped] Merge "Merge Android 12" am: 5282db2a81
-s ours
...
am skip reason: Merged-In I63befde52711ce60502d5ddfcb47e6f1faddbad0 with SHA-1 27b19b918b
is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/1847662
Change-Id: I9c9740f32aa192661db7b494f4ffc388fd1490e8
2021-10-08 01:19:44 +00:00
Xin Li
5282db2a81
Merge "Merge Android 12"
2021-10-07 23:50:45 +00:00
Xin Li
0a1470ac3c
Merge Android 12
...
Bug: 202323961
Merged-In: I63befde52711ce60502d5ddfcb47e6f1faddbad0
Change-Id: I58d44f7c910fa23a1d3fdc279252eca063aa32cf
2021-10-06 22:53:41 +00:00
Steven Moreland
e1a8d21728
Merge "Remove ndk_platform backend. Use the ndk backend." am: 18e980bac2
am: 27b19b918b
am: ef90be2d62
am: a39725ccb6
...
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/1789270
Change-Id: I0faddab755e6e430cc67cd3cfb0f752708860aa3
2021-08-27 10:14:11 +00:00
Steven Moreland
a39725ccb6
Merge "Remove ndk_platform backend. Use the ndk backend." am: 18e980bac2
am: 27b19b918b
am: ef90be2d62
...
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/1789270
Change-Id: I7cd02e886e2c6af101a1ddcba7d567ffab2710d5
2021-08-25 20:17:20 +00:00
Steven Moreland
ef90be2d62
Merge "Remove ndk_platform backend. Use the ndk backend." am: 18e980bac2
am: 27b19b918b
...
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/1789270
Change-Id: I3d7edd928a51e9af582690705db9da9e2d026d40
2021-08-25 20:02:03 +00:00
Steven Moreland
27b19b918b
Merge "Remove ndk_platform backend. Use the ndk backend." am: 18e980bac2
...
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/1789270
Change-Id: I63befde52711ce60502d5ddfcb47e6f1faddbad0
2021-08-25 19:45:22 +00:00
Steven Moreland
18e980bac2
Merge "Remove ndk_platform backend. Use the ndk backend."
2021-08-25 19:28:36 +00:00
Xin Li
fde9a61c30
[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 4381e43edc
-s ours am: ea7041e7a9
-s ours am: 3e8852b8ac
-s ours
...
am skip reason: Merged-In I784966b69df92eb1fde4fa4d80e0b1fad9c70a01 with SHA-1 019e325e34
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/15564470
Change-Id: Id30c1996aa802ac2e57bbc0da61dc1185fe5d488
2021-08-17 20:32:15 +00:00
Xin Li
3e8852b8ac
[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 4381e43edc
-s ours am: ea7041e7a9
-s ours
...
am skip reason: Merged-In I784966b69df92eb1fde4fa4d80e0b1fad9c70a01 with SHA-1 019e325e34
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/15564470
Change-Id: Ie46cebf3b19a98fe3713481b9ee519732c31f73b
2021-08-17 19:46:10 +00:00
Xin Li
ea7041e7a9
[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 4381e43edc
-s ours
...
am skip reason: Merged-In I784966b69df92eb1fde4fa4d80e0b1fad9c70a01 with SHA-1 019e325e34
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/15564470
Change-Id: Ie1b18de9be5279089f53843129e402859b262c3b
2021-08-17 18:35:40 +00:00
Xin Li
4381e43edc
Merge sc-dev-plus-aosp-without-vendor@7634622
...
Merged-In: I784966b69df92eb1fde4fa4d80e0b1fad9c70a01
Change-Id: I2b9353fae26aab847985bfe1b702f67f57e82a2f
2021-08-14 06:30:58 +00:00
Jiyong Park
6c8e9f4b94
Remove ndk_platform backend. Use the ndk backend.
...
The ndk_platform backend will soon be deprecated because the ndk backend
can serve the same purpose. This is to eliminate the confusion about
having two variants (ndk and ndk_platform) for the same ndk backend.
Bug: 161456198
Test: m
Merged-In: Ifadc89ec1cdb32dc39d5639665167c7bae336836
Change-Id: I99947e7fc58b5f6ab7d75f2af63b6bf9384917c3
2021-08-09 09:06:11 +09:00
Kalesh Singh
d6d2e1a677
Merge "libpower: Check if suspend service is null" am: a719829bb8
am: 17c06cc780
am: 019e325e34
...
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/1786228
Change-Id: I1c4069600119831b09c529b9ad2924ff59cd7260
2021-08-04 21:03:57 +00:00
Kalesh Singh
019e325e34
Merge "libpower: Check if suspend service is null" am: a719829bb8
am: 17c06cc780
...
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/1786228
Change-Id: I784966b69df92eb1fde4fa4d80e0b1fad9c70a01
2021-08-04 20:50:10 +00:00
Kalesh Singh
17c06cc780
Merge "libpower: Check if suspend service is null" am: a719829bb8
...
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/1786228
Change-Id: I7419ba70ee90ea493f8b0174a31040d1225d2af8
2021-08-04 20:29:06 +00:00
Kalesh Singh
a719829bb8
Merge "libpower: Check if suspend service is null"
2021-08-04 20:13:01 +00:00
Kalesh Singh
06c0d048b1
libpower: Check if suspend service is null
...
Before requesting wakelock ensure that we have a valid suspend service.
Use waitForService instead of checkService.
Test: libpower_test
Test: block_suspend
Test: atest NexusLauncherOutOfProcTests:MemoryTests#testAppLaunchFromWorkspace --rerun-until-failure 10
Bug: 195319784
Change-Id: If13e233360a7b5f372dd2991c1891ee0bee8544b
2021-08-04 19:30:18 +00:00
Kalesh Singh
18db79755b
Merge "libpower: Use AIDL suspend HAL" am: fc7f7499c2
am: c7b64322c2
am: da1d02fbee
...
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/1773450
Change-Id: I81e0b1cbfe26d23426f993daf216ec842f91f14b
2021-07-23 18:42:40 +00:00
Kalesh Singh
da1d02fbee
Merge "libpower: Use AIDL suspend HAL" am: fc7f7499c2
am: c7b64322c2
...
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/1773450
Change-Id: I9b3f2b4bb02871b4b8ac65c2ddf1c740e60dd4db
2021-07-23 18:23:27 +00:00
Kalesh Singh
c7b64322c2
Merge "libpower: Use AIDL suspend HAL" am: fc7f7499c2
...
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/1773450
Change-Id: I1c83a40f1bad480c85e9e31d881638bc5c89b48c
2021-07-23 18:11:23 +00:00
Kalesh Singh
fc7f7499c2
Merge "libpower: Use AIDL suspend HAL"
2021-07-23 17:17:03 +00:00
Kalesh Singh
b64a38eee2
libpower: Use AIDL suspend HAL
...
Use the system susepnd AIDL hal for requesting wakelocks from libpower
or libhardware_legacy.
Bug: 170260236
Test: boot test on cf (suspend blocker works).
Test: libpower_test
Test: block_suspend
Change-Id: I8fc345c33fb893ca11603826b0e993ca908d5b20
2021-07-22 19:57:05 +00:00
Ahmed ElArabawy
e26703dab9
WiFi: Add new SAR Scenarios for foldable devices am: 2cf8cd3978
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/14556075
Change-Id: Ie0c7d52559c88715a851686c3e26f71ac3155ca8
2021-06-02 02:38:17 +00:00
Ahmed ElArabawy
2cf8cd3978
WiFi: Add new SAR Scenarios for foldable devices
...
This commit adds new SAR scenarios for foldable devices.
Bug: 188138055
Test: Verify proper scenario selection
Change-Id: I472d3989edb1f8949a0eb1efd249b13aa55dc537
2021-05-19 09:11:23 +00:00
chenpaul
4ebb0af45c
Wifi: Add argument "WifiHandle" in "wifi_set_subsystem_restart_handler"
...
Bug: 178126071
Bug: 183483123
Test: vendor HAL can received API call
Change-Id: I0d6c9ce294e1bcea1ed19e4050babd923e6b6141
2021-03-31 20:15:55 +08:00
chenpaul
35390b6dff
Wifi: New API to query the trigger subsystem restart
...
This commit adds a method to forward the subsystem restart request
Bug: 178126071
Test: Trigger firmware restart and make sure event was forwarded
Change-Id: I5e97e645b630822865b1614f999e8b465a6d2b0b
2021-03-19 15:21:39 +08:00
Ahmed ElArabawy
1e6f8f6fcf
Merge "WiFi: Add new SAR scenarios" into sc-dev
2021-03-18 21:10:11 +00:00
Ahmed ElArabawy
958307b14f
WiFi: Add new SAR scenarios
...
This commit adds new SAR Scenarios.
Bug: 162191325
Test: Builds successfully
Change-Id: I70c45a5675b9bc374422fe732f888b3782058dd2
2021-03-15 21:41:42 -07:00
Kumar Anand
f2eed442a6
Wifi: Remove multiple definitions
...
Remove compilation warnings due to -Wtypedef-redefinition.
Bug: 160212907
Test: Build Successfully
Change-Id: I8925cf33fa64fbba4a6cbb782ecc107a7741fe87
2021-03-15 11:27:54 -07:00
Kalesh Singh
a731921669
Merge "RAII style wakelocks: Add tryGet() factory method." am: ddff8e6dd0
am: e3a6357533
am: 9176bf1929
...
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/1592033
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I51ad002d2d778d6e674a86363e74eb5040d3219a
2021-02-24 23:51:50 +00:00
Kalesh Singh
9176bf1929
Merge "RAII style wakelocks: Add tryGet() factory method." am: ddff8e6dd0
am: e3a6357533
...
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/1592033
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4788f1e46ef2c581f74cdbb10350ccd7f9547c6a
2021-02-24 22:58:01 +00:00
Kalesh Singh
e3a6357533
Merge "RAII style wakelocks: Add tryGet() factory method." am: ddff8e6dd0
...
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/1592033
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1d63478a6f2956d687971033621360f2abb3b9d2
2021-02-24 22:14:07 +00:00
Kalesh Singh
ddff8e6dd0
Merge "RAII style wakelocks: Add tryGet() factory method."
2021-02-24 18:49:58 +00:00
Kalesh Singh
d8da2af1e5
RAII style wakelocks: Add tryGet() factory method.
...
Wakelock acquisition can fail if suspend service is not available.
Make this clear by returning an optional value that client must
check before entering wakelock critical sections.
Bug: b/179229598
Test: Boot test on Pixel 4 device
Change-Id: Ied00fa919c20d8a30f1c40ee34a91a2a7e240689
2021-02-23 10:06:19 -05:00
Xin Li
98759c6fb5
[automerger skipped] Mark ab/7061308 as merged in stage. am: b4d4bcc011
-s ours am: c48f0b7f15
-s ours
...
am skip reason: Change-Id If168d378ac5793e151f2b502b004e4da515865e7 with SHA-1 60185e956c
is in history
Original change: undetermined
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I69e22496eb5ce2ae342e5eebec88fc1526628ec4
2021-02-20 17:37:41 +00:00
Bob Badour
b6ce28b677
Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/libhardware_legacy" am: afd79930cc
am: 63be865585
am: fba2066876
...
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/1588038
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I362a99e806ff938c3105e654fd3251a9da875d00
2021-02-20 17:23:05 +00:00
Xin Li
c48f0b7f15
[automerger skipped] Mark ab/7061308 as merged in stage. am: b4d4bcc011
-s ours
...
am skip reason: Change-Id If168d378ac5793e151f2b502b004e4da515865e7 with SHA-1 60185e956c
is in history
Original change: undetermined
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9d3d3168ae0b6b56a8fe1a44ebb1be137f5276b4
2021-02-20 11:44:23 +00:00
Xin Li
b4d4bcc011
Mark ab/7061308 as merged in stage.
...
Bug: 180401296
Merged-In: If168d378ac5793e151f2b502b004e4da515865e7
Change-Id: I584355711fa46131ff11fdafdb1cfcc53882796b
2021-02-20 00:24:30 -08:00
Bob Badour
fba2066876
Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/libhardware_legacy" am: afd79930cc
am: 63be865585
...
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/1588038
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie510edc0b80ce8fb322aeaf77faadc2171f0d833
2021-02-19 02:25:32 +00:00
Bob Badour
63be865585
Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/libhardware_legacy" am: afd79930cc
...
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware_legacy/+/1588038
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9bc3c423e20e821e7d841b67cbdb6a811fbe25a9
2021-02-19 00:58:45 +00:00