Marin Shalamanov
051c72e1ff
Merge "Update the Composer HAL docs for setContentType"
2021-10-11 09:48:20 +00:00
TreeHugger Robot
06916e1ecf
[automerger skipped] Merge "WIFI: Add log to debug onSubsystemRestart" into sc-qpr1-dev am: 8169c932e6
am: e951b8cf0b
-s ours am: b0a9c00813
-s ours
...
am skip reason: Merged-In I160adc6006d078fcc72c1768927e87e378fd675e with SHA-1 69c3c22603
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15988967
Change-Id: I79897305448076a47e981dd3611436b6ebbbf593
2021-10-09 23:58:34 +00:00
TreeHugger Robot
e0b48f6cc8
[automerger skipped] Merge "WIFI: Add log to debug onSubsystemRestart" into sc-qpr1-dev am: 8169c932e6
am: 7e30d84d51
am: 95b5673eac
-s ours
...
am skip reason: Merged-In I160adc6006d078fcc72c1768927e87e378fd675e with SHA-1 2fa7d52177
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15988967
Change-Id: Ic74a4622280051892f58d7fc4c55b88c9495b789
2021-10-09 23:58:26 +00:00
TreeHugger Robot
b0a9c00813
[automerger skipped] Merge "WIFI: Add log to debug onSubsystemRestart" into sc-qpr1-dev am: 8169c932e6
am: e951b8cf0b
-s ours
...
am skip reason: Merged-In I160adc6006d078fcc72c1768927e87e378fd675e with SHA-1 69c3c22603
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15988967
Change-Id: Idde666c86a7ee1b7985e589b179831a68ce85192
2021-10-09 23:42:01 +00:00
TreeHugger Robot
95b5673eac
Merge "WIFI: Add log to debug onSubsystemRestart" into sc-qpr1-dev am: 8169c932e6
am: 7e30d84d51
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15988967
Change-Id: I46a714421c1d8345f5ee3730e6c33bed8a85f100
2021-10-09 23:41:41 +00:00
TreeHugger Robot
7e30d84d51
Merge "WIFI: Add log to debug onSubsystemRestart" into sc-qpr1-dev am: 8169c932e6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15988967
Change-Id: I96a417467346a57b13c2efae12a183d78506afc3
2021-10-09 23:21:43 +00:00
TreeHugger Robot
e951b8cf0b
Merge "WIFI: Add log to debug onSubsystemRestart" into sc-qpr1-dev am: 8169c932e6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15988967
Change-Id: I8798d3ad725e8fe294ce835a3a185351117f701c
2021-10-09 23:21:41 +00:00
TreeHugger Robot
8169c932e6
Merge "WIFI: Add log to debug onSubsystemRestart" into sc-qpr1-dev
2021-10-09 23:08:21 +00:00
Shawn Willden
56534c3412
Merge "Delete KM1" am: 13274fa22d
am: 9c379e224f
am: bb661ea978
am: b98e256589
am: 7cbfeb37c3
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1849793
Change-Id: I498a9212fdec4b3852c737bd18c9dd102774851a
2021-10-09 02:03:15 +00:00
Shawn Willden
7cbfeb37c3
Merge "Delete KM1" am: 13274fa22d
am: 9c379e224f
am: bb661ea978
am: b98e256589
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1849793
Change-Id: I4aa2304e35f111be4590245b96ce63d3d9463497
2021-10-09 01:49:14 +00:00
Shawn Willden
b98e256589
Merge "Delete KM1" am: 13274fa22d
am: 9c379e224f
am: bb661ea978
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1849793
Change-Id: I06a8d07eeda25623aed35bb459690a76ada36916
2021-10-09 01:33:10 +00:00
Shawn Willden
bb661ea978
Merge "Delete KM1" am: 13274fa22d
am: 9c379e224f
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1849793
Change-Id: I6d7acf78da1a57e078ffd21378d2021740633960
2021-10-09 01:19:59 +00:00
Shawn Willden
9c379e224f
Merge "Delete KM1" am: 13274fa22d
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1849793
Change-Id: I955b0d66d14cf41c5b6a1696f66fd415f97be2e7
2021-10-09 01:03:05 +00:00
Shawn Willden
13274fa22d
Merge "Delete KM1"
2021-10-09 00:46:52 +00:00
TreeHugger Robot
3f3ab31434
Merge "Fix CLUSTER_SWITCH_UI init value."
2021-10-08 22:15:42 +00:00
chenpaul
69c3c22603
WIFI: Add log to debug onSubsystemRestart
...
onSubsystemRestart should be triggered by wifi HAL
when subsystem restart happened.
Add log to debug why this callback function was not trigger at
unexpected corner case.
Bug: 201330066
Test: Manual test
Change-Id: I160adc6006d078fcc72c1768927e87e378fd675e
Merged-In: I160adc6006d078fcc72c1768927e87e378fd675e
2021-10-08 20:56:37 +00:00
Yu Shan
6e289c86d9
Fix CLUSTER_SWITCH_UI init value.
...
CLUSTER_SWITCH_UI is a INT32 property that should only have one
init value instead of 2. This is causing confusion in the code
that uses the default value.
Test: None
Bug: 202448791
Change-Id: Id55f448f1dd5ee33291e30d32e6fbf868ad8fe3a
2021-10-08 13:26:30 -07:00
Shuo Qian
4306ac3cbd
[automerger skipped] Merge "Config the number of live modems based on current multisim number." am: 1ea58ef3a4
am: 881eb60d01
am: 6ffb3be9b7
-s ours am: 955143240d
-s ours am: f04a24f3b8
-s ours
...
am skip reason: Merged-In If2aca6add38b801be011797c1da4c8de32f1bef6 with SHA-1 400ce4ff76
is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1850573
Change-Id: Ia9d639e143daeb84684650eb2672b137aba6feb1
2021-10-08 19:44:05 +00:00
Shuo Qian
9ef7e94aa3
[automerger skipped] Skip slot 2 for other radio modules in single sim mode am: 07f1c21f4a
am: ff5824235e
-s ours am: 8c858231a1
-s ours am: ef006c3894
-s ours am: 15d13f3c36
-s ours
...
am skip reason: Merged-In Idc115954c8ccb26a6127a80d466f22559be641d2 with SHA-1 c6a7143b1d
is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1850574
Change-Id: Ie58379ab152354095e0212c4fda96ee00c9ebe9e
2021-10-08 19:43:53 +00:00
Shuo Qian
f04a24f3b8
[automerger skipped] Merge "Config the number of live modems based on current multisim number." am: 1ea58ef3a4
am: 881eb60d01
am: 6ffb3be9b7
-s ours am: 955143240d
-s ours
...
am skip reason: Merged-In If2aca6add38b801be011797c1da4c8de32f1bef6 with SHA-1 400ce4ff76
is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1850573
Change-Id: I83ed80f00f8f47cf4d394d625a331313ba1edc59
2021-10-08 19:23:31 +00:00
Shuo Qian
15d13f3c36
[automerger skipped] Skip slot 2 for other radio modules in single sim mode am: 07f1c21f4a
am: ff5824235e
-s ours am: 8c858231a1
-s ours am: ef006c3894
-s ours
...
am skip reason: Merged-In Idc115954c8ccb26a6127a80d466f22559be641d2 with SHA-1 c6a7143b1d
is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1850574
Change-Id: Ie8c02f85250f3f8033b7f0b071544b4929c95d6c
2021-10-08 19:23:12 +00:00
Shuo Qian
955143240d
[automerger skipped] Merge "Config the number of live modems based on current multisim number." am: 1ea58ef3a4
am: 881eb60d01
am: 6ffb3be9b7
-s ours
...
am skip reason: Merged-In If2aca6add38b801be011797c1da4c8de32f1bef6 with SHA-1 400ce4ff76
is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1850573
Change-Id: I7a3df70d16955680e411d44d6cf47b31886406da
2021-10-08 19:09:28 +00:00
Shuo Qian
ef006c3894
[automerger skipped] Skip slot 2 for other radio modules in single sim mode am: 07f1c21f4a
am: ff5824235e
-s ours am: 8c858231a1
-s ours
...
am skip reason: Merged-In Idc115954c8ccb26a6127a80d466f22559be641d2 with SHA-1 c6a7143b1d
is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1850574
Change-Id: I3cb00978168304026fa64c1ec48e420868a5a418
2021-10-08 19:09:22 +00:00
Shuo Qian
6ffb3be9b7
Merge "Config the number of live modems based on current multisim number." am: 1ea58ef3a4
am: 881eb60d01
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1850573
Change-Id: I88169d49887ff9df1c20d133581a2e328504cef3
2021-10-08 18:54:32 +00:00
Shuo Qian
8c858231a1
[automerger skipped] Skip slot 2 for other radio modules in single sim mode am: 07f1c21f4a
am: ff5824235e
-s ours
...
am skip reason: Merged-In Idc115954c8ccb26a6127a80d466f22559be641d2 with SHA-1 c6a7143b1d
is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1850574
Change-Id: I33d70a3c185e05f5578ef61bd8727daf0e225ef3
2021-10-08 18:54:05 +00:00
Shuo Qian
881eb60d01
Merge "Config the number of live modems based on current multisim number." am: 1ea58ef3a4
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1850573
Change-Id: I27089d18fa00c29103c75b6640509d8c88295f79
2021-10-08 18:41:45 +00:00
Shuo Qian
ff5824235e
Skip slot 2 for other radio modules in single sim mode am: 07f1c21f4a
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1850574
Change-Id: Ic0dd661931458dcc598886b417e74a5f04bae9d1
2021-10-08 18:41:20 +00:00
Shuo Qian
1ea58ef3a4
Merge "Config the number of live modems based on current multisim number."
2021-10-08 18:32:00 +00:00
Shuo Qian
07f1c21f4a
Skip slot 2 for other radio modules in single sim mode
...
Bug: 199986032
Test: atest
Change-Id: Idc115954c8ccb26a6127a80d466f22559be641d2
Merged-In: Idc115954c8ccb26a6127a80d466f22559be641d2
(cherry picked from commit c6a7143b1d
)
2021-10-08 16:26:21 +00:00
Shuo Qian
b96b0ec884
Config the number of live modems based on current multisim number.
...
Test: atest VtsHalRadioConfigV1_1TargetTest
Bug: 200889748
Change-Id: If2aca6add38b801be011797c1da4c8de32f1bef6
Merged-In: If2aca6add38b801be011797c1da4c8de32f1bef6
(cherry picked from commit 400ce4ff76
)
2021-10-08 16:25:26 +00:00
TreeHugger Robot
0cc2eb624f
Merge "Expose HIDL HALs to car framework apex"
2021-10-08 15:22:28 +00:00
TreeHugger Robot
91e550f570
Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/interfaces"
2021-10-08 12:37:21 +00:00
Yiming Pan
31422453a7
Merge "Add OWNERS for VTS module VtsHalAuthSecretV1_0TargetTest" am: 54ac1cbb35
am: 29a7e8c9f8
am: 27dfcf055c
am: 7c9d3eac06
am: caba374175
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1793836
Change-Id: Ib57376b6fba57ea009ba123be3a8fbdfe5c58feb
2021-10-08 09:13:14 +00:00
Xin Li
f2eaab86e5
[automerger skipped] Merge "Merge Android 12" am: 59772dd098
-s ours am: c8e48296a0
-s ours am: c6364f6c86
-s ours am: e98e16ed59
-s ours am: b88cc6854d
-s ours
...
am skip reason: Merged-In I76b505672b7c78b03a9c79df6473212ea5c65072 with SHA-1 4e9cab823d
is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1847928
Change-Id: I8aadcc8df5b80c8bbb4fee9f54159a32ed736abd
2021-10-08 08:59:50 +00:00
Yiming Pan
caba374175
Merge "Add OWNERS for VTS module VtsHalAuthSecretV1_0TargetTest" am: 54ac1cbb35
am: 29a7e8c9f8
am: 27dfcf055c
am: 7c9d3eac06
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1793836
Change-Id: I8026eeece9193e099a73f8700a4c5e389029611e
2021-10-08 08:39:39 +00:00
Xin Li
b88cc6854d
[automerger skipped] Merge "Merge Android 12" am: 59772dd098
-s ours am: c8e48296a0
-s ours am: c6364f6c86
-s ours am: e98e16ed59
-s ours
...
am skip reason: Merged-In I76b505672b7c78b03a9c79df6473212ea5c65072 with SHA-1 4e9cab823d
is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1847928
Change-Id: I7458ba60cbf418e6f876da6c467308a35b074efc
2021-10-08 08:29:40 +00:00
Yiming Pan
7c9d3eac06
Merge "Add OWNERS for VTS module VtsHalAuthSecretV1_0TargetTest" am: 54ac1cbb35
am: 29a7e8c9f8
am: 27dfcf055c
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1793836
Change-Id: Iba855764efa41a16374fb8f0bac43482adbdc7b4
2021-10-08 08:06:38 +00:00
Xin Li
e98e16ed59
[automerger skipped] Merge "Merge Android 12" am: 59772dd098
-s ours am: c8e48296a0
-s ours am: c6364f6c86
-s ours
...
am skip reason: Merged-In I76b505672b7c78b03a9c79df6473212ea5c65072 with SHA-1 4e9cab823d
is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1847928
Change-Id: Iff64f8b7ad443b781006856f5ec4bff21075adbd
2021-10-08 07:56:41 +00:00
TreeHugger Robot
43720ae394
Merge "Merge "Camera: Add static metadata that can map device state to orientation" into sc-v2-dev am: 6621c1ad05" into sc-v2-dev-plus-aosp am: 11ac9efa38
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/16010600
Change-Id: Idc7d3f7b531569dbabeb5d83483b2ae1f5f49aec
2021-10-08 06:20:28 +00:00
TreeHugger Robot
11ac9efa38
Merge "Merge "Camera: Add static metadata that can map device state to orientation" into sc-v2-dev am: 6621c1ad05" into sc-v2-dev-plus-aosp
2021-10-08 06:08:48 +00:00
Yiming Pan
27dfcf055c
Merge "Add OWNERS for VTS module VtsHalAuthSecretV1_0TargetTest" am: 54ac1cbb35
am: 29a7e8c9f8
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1793836
Change-Id: Ied7dc60c3b57647da72f7ad617ea77ae4e3b9959
2021-10-08 01:50:04 +00:00
Xin Li
c6364f6c86
[automerger skipped] Merge "Merge Android 12" am: 59772dd098
-s ours am: c8e48296a0
-s ours
...
am skip reason: Merged-In I76b505672b7c78b03a9c79df6473212ea5c65072 with SHA-1 4e9cab823d
is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1847928
Change-Id: I98de3f79fad3ed7d759d02203076b1fd6d4d1b76
2021-10-08 01:39:26 +00:00
chenpaul
2fa7d52177
WIFI: Add log to debug onSubsystemRestart
...
onSubsystemRestart should be triggered by wifi HAL
when subsystem restart happened.
Add log to debug why this callback function was not trigger at
unexpected corner case.
Bug: 201330066
Test: Manual test
Change-Id: I160adc6006d078fcc72c1768927e87e378fd675e
2021-10-08 01:37:55 +00:00
Yiming Pan
29a7e8c9f8
Merge "Add OWNERS for VTS module VtsHalAuthSecretV1_0TargetTest" am: 54ac1cbb35
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1793836
Change-Id: I352da40b2d0402dde50971ec04f3e40f0a16d01d
2021-10-08 01:29:25 +00:00
Xin Li
c8e48296a0
[automerger skipped] Merge "Merge Android 12" am: 59772dd098
-s ours
...
am skip reason: Merged-In I76b505672b7c78b03a9c79df6473212ea5c65072 with SHA-1 4e9cab823d
is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1847928
Change-Id: I8e0d9a4a976b62ddb5fc5ffae58d44e7bea12441
2021-10-08 01:20:00 +00:00
Yiming Pan
54ac1cbb35
Merge "Add OWNERS for VTS module VtsHalAuthSecretV1_0TargetTest"
2021-10-08 00:24:16 +00:00
Xin Li
59772dd098
Merge "Merge Android 12"
2021-10-07 23:49:53 +00:00
Yiming Pan
90abd69bfe
Merge "Update owner information for VTS module VtsHalBluetoothA2dpV1_0TargetTest." am: 2091c6c619
am: d191220799
am: 3678f6b65c
am: 0cbf639398
am: f703ecb8bd
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1836657
Change-Id: I950e03694a0088517d3ca9204ae3c4c82c83d1ed
2021-10-07 23:46:26 +00:00
Yiming Pan
f703ecb8bd
Merge "Update owner information for VTS module VtsHalBluetoothA2dpV1_0TargetTest." am: 2091c6c619
am: d191220799
am: 3678f6b65c
am: 0cbf639398
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1836657
Change-Id: I2f790ad07b36a2a5c552a7c0a26c50256b6a15b4
2021-10-07 23:39:25 +00:00
Yiming Pan
0cbf639398
Merge "Update owner information for VTS module VtsHalBluetoothA2dpV1_0TargetTest." am: 2091c6c619
am: d191220799
am: 3678f6b65c
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1836657
Change-Id: If3b10bf16bc28218350b3620afb4c6200ecc66d4
2021-10-07 23:32:58 +00:00