PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
120,624 Commits 1 Branch 0 Tags
36d78f8fe0c8fb9bc9702e105f5890f23bcc8c16
Commit Graph

120624 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
cebb55826f Merge "Fix failing checkcolor_hook in Settings" into udc-dev 2023-03-08 14:00:45 +00:00
Matías Hernández
0aba4e342a Fix failing checkcolor_hook in Settings 
(Fixed according to the instructions in prebuilts/checkcolor/README.md).

Fixes: 272244692
Test: repo upload
Change-Id: Ib53c6b302984250e6c4dfe058a74697a62b94e26
 2023-03-08 13:35:00 +00:00
Tiger Huang
2238b4e807 Merge "Add an developer option to enable config_navBarDefaultTransparent" into udc-dev 2023-03-08 12:47:29 +00:00
Ankita Vyas
0da1131343 Display toast for clone app creation and completion in App Info page. 
Bug: 271990959
Test: manual
Change-Id: I93641c1bf675ac531fbf8201203d5141aafd39cc
 2023-03-08 10:55:37 +00:00
Maciej Żenczykowski
850993d166 Merge "settings: allow enabling ethernet tethering independent of link state" am: 905d584b15 am: f73112b56e am: 7e21dec65e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2475089

Change-Id: I5e5711aeb90bb8bd860fd8515975f2b7d90ce689
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-08 05:28:51 +00:00
Maciej Żenczykowski
7e21dec65e Merge "settings: allow enabling ethernet tethering independent of link state" am: 905d584b15 am: f73112b56e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2475089

Change-Id: I68e8a5898af8426250e1f0eb2d187e977f82dd13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-08 04:15:54 +00:00
Maciej Żenczykowski
f73112b56e Merge "settings: allow enabling ethernet tethering independent of link state" am: 905d584b15 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2475089

Change-Id: I3976958e427d18b9b5c3d6ce59cb45969145fa23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-08 03:41:54 +00:00
Maciej Żenczykowski
905d584b15 Merge "settings: allow enabling ethernet tethering independent of link state" 2023-03-08 03:05:53 +00:00
Ankita Vyas
080e4b02c7 Merge "Add config for display Cloned Apps page in Settings." into udc-dev 2023-03-08 02:48:24 +00:00
Patrick Rohr
6f9062297f settings: allow enabling ethernet tethering independent of link state 
A user should be able to enable tethering even if the interface does not
have link yet. Therefore, the toggle should be active if any interface
is available, independent of its link state.

Test: TH
Bug: 234036868
Change-Id: I2ae25207a766d71217dd6d17f3f9b74ceb261238
 2023-03-08 00:57:03 +00:00
Candice Lo
0290fb1cf3 Merge "Set the settings key when the font size is changed" into udc-dev 2023-03-08 00:41:02 +00:00
Becca Hughes
9e2e47c553 Merge "Move CredentialProviderInfo for test/settings (settings)" into udc-dev 2023-03-07 22:40:46 +00:00
Julia Reynolds
e84f0aeda4 [automerger skipped] Merge "[DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into tm-dev am: 65a6e18fcb am: 56e2a08f3f am: 769dc23f37 am: 0cb9c59631 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21095803

Change-Id: I05e42da71f9c3dc7ebed33cc511d2c773ea48daf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 21:24:20 +00:00
Valentin Iftime
0b42ff676a [automerger skipped] [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails am: 250edeead7 am: fe2ad5085f am: b25fcaab93 am: 1dd5830b05 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21095803

Change-Id: Iaaee2a2cb381616fb44c78e48d8956df187650c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 21:23:55 +00:00
Iavor-Valentin Iftime
6bf58bff25 [automerger skipped] Merge "[DO NO MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into rvc-dev am: 450cacbee4 am: e116e63a91 -s ours am: 91ade78763 -s ours am: 89c9dc07df -s ours am: 7a997113d1 -s ours am: 5cd3dc7d1d -s ours am: 66b0c4e41b -s ours am: fa8d8ba74c -s ours am: 67fb12cbfd -s ours 
am skip reason: Merged-In I875b9f2fc32c252acdcf8374a14067836e0f1ac6 with SHA-1 9a7bd79ca3 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21296639

Change-Id: Ieab49e4788480ca22ddc26998640fa1c2955146e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 21:20:24 +00:00
Presubmit Automerger Backend
a24080f47f [automerger skipped] [automerge] [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails 2p: 9a7bd79ca3 am: dbd4423d03 -s ours am: 3d35d4f195 -s ours am: d9561eccb6 -s ours am: ca46a99755 -s ours am: 27a594a80a -s ours am: def8d0261d -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21298578

Change-Id: I9a458d6df499022ed9ded204e344397e8d311d4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 21:13:35 +00:00
Valentin Iftime
ed73e49a2c [automerger skipped] [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails am: d374ca1324 -s ours am: 34c63adf58 -s ours am: 0fd2472a0a -s ours am: f383a0a176 -s ours am: cf9f09008b -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21591506

Change-Id: I3aa4a584e42eef11cc12c790488aff284cd93acd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 20:44:33 +00:00
Patty Huang
9745460cad Merge "Add LE Audio allow list feature switcher in the developer option menu" am: 5bb798f518 am: 0086b200d0 am: ced8230ee9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2387973

Change-Id: I30cf2f5e5fcf534877986839aba2f908b8f3b461
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 19:44:08 +00:00
Treehugger Robot
3e7889ce0d [automerger skipped] Merge "Add getSubscriptionId API" am: 7813c4a9a3 am: 5e84729b10 am: 98a648d4f2 -s ours 
am skip reason: Merged-In I0a43d33daf523e6f0bea054c8965281bafbbcaa4 with SHA-1 f4982a080b is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2470383

Change-Id: I63e0e83bad08da0869f07ae4b58c18f2e80cd874
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 19:00:10 +00:00
Matías Hernández
4f4368b7c2 Merge "Don't allow setting channels to bypass DND if the app cannot show notifications" into udc-dev 2023-03-07 18:18:27 +00:00
Becca Hughes
e174f66a71 Move CredentialProviderInfo for test/settings (settings) 
This is a precusor CL to adding a subtitle for settings
to use so we need to move CPI where it can be used
by settings, atest and CTS.

Test: ondevice & atest & cts
Bug: 253157366
Change-Id: Ief25f562eb5c2ca4438701de8a8e26941a8370a3
(cherry picked from commit on googleplex-android-review.googlesource.com host: 573e844275)
Merged-In: Ief25f562eb5c2ca4438701de8a8e26941a8370a3
 2023-03-07 17:14:09 +00:00
Candice Lo
f19f710b01 Set the settings key when the font size is changed 
The key ACCESSIBILITY_FONT_SCALING_HAS_BEEN_CHANGED will be always ON
after users modify the font size for the first time.

Bug: 269679768
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FontSizeDataTest
Change-Id: I5967227ce05d5b8bf37dfec9aafa015c5cacbd30
Merged-In: I382e4ecd3c335d7b046f157cedc093fc40c3a77a
 2023-03-07 15:56:58 +00:00
Candice Lo
dbaea0f1c2 Set the settings key when the font size is changed 
The key ACCESSIBILITY_FONT_SCALING_HAS_BEEN_CHANGED will be always ON
after users modify the font size for the first time.

Bug: 269679768
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FontSizeDataTest
Change-Id: I382e4ecd3c335d7b046f157cedc093fc40c3a77a
 2023-03-07 15:42:29 +00:00
Matías Hernández
bf1b95e0fe Don't allow setting channels to bypass DND if the app cannot show notifications 
The fix makes the flow more consistent with preexisting behavior:
* Apps appear in the "Apps that can interrupt" section only if some channels are set to bypass DND *and* the app is able to show notifications.
* Channels cannot be set to bypass if those individual channels are blocked.

Fixes: 265064188
Test: atest AppChannelsBypassingDndPreferenceControllerTest
Change-Id: If10f086fd60f0f70f53adb8f5cd67f90936bc35f
 2023-03-07 16:41:36 +01:00
Paul Wang
f1007faeba Avoid disabling LE Audio when BT is off 
The `updateState` function gets called when the Developer Options menua
is rendered (opened). Originally when BT is off at this point, LE Audio
is disabled, and the user needs to reboot the device again to enable LE
Audio. This CL fixes this and marks the option as disabled when BT is
off.

Bug: 263684630
Test: Manual
Change-Id: I243e2c57fc12bfefd4ab83f63336fb41639f05a0
 2023-03-07 13:30:37 +00:00
TreeHugger Robot
e4058d20a7 Merge "Fix battery saver switch test case" into udc-dev 2023-03-07 13:13:19 +00:00
Wesley Wang
5d18287b3b Fix battery saver switch test case 
- Fix the test fail which cause by ag/21784766, and also mentioned at
   ag/21644522

Bug: 260380584
Test: make SettingsRoboTests
Change-Id: I72a7a24f57a7eeeacefeb40eef3025398329379b
 2023-03-07 11:44:55 +00:00
Sunny Shao
cb24cb29db Merge "Add the SPA page enter/leave logging metrcis." into udc-dev 2023-03-07 10:12:55 +00:00
Daniel Huang
a2375807ec Merge "Update KeyboardLayoutPickerControllerTest" into udc-dev 2023-03-07 10:08:10 +00:00
SongFerng Wang
524b15c627 Merge "Using upper case country code" into udc-dev 2023-03-07 09:43:30 +00:00
danielwbhuang
cf4be05b64 Update KeyboardLayoutPickerControllerTest 
The logic is changed, so we need to update the test. (https://screenshot.googleplex.com/AnrJgmGfK2fPxmQ.png)

Bug: 270109384
Test: atest KeyboardLayoutPickerControllerTest
[1/8] com.android.settings.inputmethod.KeyboardLayoutPickerControllerTest#isAlwaysAvailable: PASSED (5.876s)
[2/8] com.android.settings.inputmethod.KeyboardLayoutPickerControllerTest#test_createPreferenceHierarchy_shouldAddTwoPreference: PASSED (192ms)
[3/8] com.android.settings.inputmethod.KeyboardLayoutPickerControllerTest#testOnDeviceRemove_getSameDevice_shouldFinish: PASSED (5.797s)
[4/8] com.android.settings.inputmethod.KeyboardLayoutPickerControllerTest#testLifecycle_onStart_shouldRegisterInputManager: PASSED (1.495s)
[5/8] com.android.settings.inputmethod.KeyboardLayoutPickerControllerTest#test_createPreferenceHierarchy_shouldAddOnePreference: PASSED (75ms)
[6/8] com.android.settings.inputmethod.KeyboardLayoutPickerControllerTest#testOnDeviceRemove_getDifferentDevice_shouldNotFinish: PASSED (366ms)
[7/8] com.android.settings.inputmethod.KeyboardLayoutPickerControllerTest#testLifecycle_onStop_shouldCancelRegisterInputManager: PASSED (65ms)
[8/8] com.android.settings.inputmethod.KeyboardLayoutPickerControllerTest#testLifecycle_onStart_NoInputDevice_shouldReturn: PASSED (309ms)

Change-Id: I018873cba9e73c6d684d828858cc1b08d3f2f7f9
 2023-03-07 16:31:15 +08:00
SongFerngWang
d1d1ecc9d3 Using upper case country code 
According to the ISO 3166-1, the two letters country code is upper case.

Bug: 271753491
Test: build pass and local test
Change-Id: Ia71cb6de45682407e4d988522c50d83659fe0017
 2023-03-07 16:27:36 +08:00
Sunny Shao
de797e1198 Add the SPA page enter/leave logging metrcis. 
- Add the SpaLogProvider and SpaLogData for logging writing.
- Write the SPA page enter/leave logging.

Fixes: 271793388
Bug: 253979024
Test: atest SpaActivityTest SpaLogDataTest MetricsDataModelTest
Change-Id: I0ad5af39ba207ac00d58f6392496effa3adc42f4
 2023-03-07 16:10:56 +08:00
Angela Wang
ccb009c34f Merge "Updates to use flash notification settings keys in settings provider" into udc-dev 2023-03-07 06:58:53 +00:00
Tom Hsu
39129e09d3 Merge "Add confirmation dialog for system locale change." into udc-dev 2023-03-07 03:31:02 +00:00
Julia Reynolds
0cb9c59631 Merge "[DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into tm-dev am: 65a6e18fcb am: 56e2a08f3f am: 769dc23f37 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21095803

Change-Id: Ie62d086193232e8a13e44c922f332ce1d9541ddc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 01:53:22 +00:00
Valentin Iftime
1dd5830b05 [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails am: 250edeead7 am: fe2ad5085f am: b25fcaab93 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21095803

Change-Id: I95599c7885cfe417a60db4b18044dec3019bd9c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 01:53:13 +00:00
Julia Reynolds
769dc23f37 Merge "[DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into tm-dev am: 65a6e18fcb am: 56e2a08f3f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21095803

Change-Id: I51889453230cabae593a2b1f712f721f218543ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 01:18:37 +00:00
Valentin Iftime
b25fcaab93 [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails am: 250edeead7 am: fe2ad5085f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21095803

Change-Id: If68221c5187809f18c0d0d3e9775d351017f2f82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 01:18:33 +00:00
Julia Reynolds
a5cb399e33 [automerger skipped] Merge "[DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into tm-dev am: 65a6e18fcb am: 03d8116dec -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21095803

Change-Id: I48f619653dd7d9c93200c7dcff5167f3be4a032d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 01:15:54 +00:00
Valentin Iftime
940d0ca617 [automerger skipped] [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails am: 250edeead7 am: 573ee43d30 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21095803

Change-Id: Ibd3fa951f0536c29edf94fffd8b6ab9a4550041c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 01:15:46 +00:00
Julia Reynolds
56e2a08f3f Merge "[DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into tm-dev am: 65a6e18fcb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21095803

Change-Id: Ie7171fe36f6fda62ce827c41b18e8c625c94359b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 00:43:17 +00:00
Valentin Iftime
fe2ad5085f [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails am: 250edeead7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21095803

Change-Id: I4942c2bb54de7d06d147d1a592ae25ac5184ab9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 00:43:14 +00:00
Julia Reynolds
03d8116dec Merge "[DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into tm-dev am: 65a6e18fcb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21095803

Change-Id: Ibb5eb78a2a204c65e07b5d7aadb1192140d885fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 00:42:46 +00:00
Valentin Iftime
573ee43d30 [DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails am: 250edeead7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21095803

Change-Id: I7720486012e67028bfa6887fa02078ad0094e00a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-07 00:42:42 +00:00
Julia Reynolds
65a6e18fcb Merge "[DO NOT MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into tm-dev 2023-03-07 00:03:01 +00:00
Iavor-Valentin Iftime
67fb12cbfd [automerger skipped] Merge "[DO NO MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into rvc-dev am: 450cacbee4 am: e116e63a91 -s ours am: 91ade78763 -s ours am: 89c9dc07df -s ours am: 7a997113d1 -s ours am: 5cd3dc7d1d -s ours am: 66b0c4e41b -s ours am: fa8d8ba74c -s ours 
am skip reason: Merged-In I875b9f2fc32c252acdcf8374a14067836e0f1ac6 with SHA-1 9a7bd79ca3 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21296639

Change-Id: Ib0c69f26935ada1c1b7415da093a52a734034fe8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-06 22:15:23 +00:00
Iavor-Valentin Iftime
fa8d8ba74c [automerger skipped] Merge "[DO NO MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into rvc-dev am: 450cacbee4 am: e116e63a91 -s ours am: 91ade78763 -s ours am: 89c9dc07df -s ours am: 7a997113d1 -s ours am: 5cd3dc7d1d -s ours am: 66b0c4e41b -s ours 
am skip reason: Merged-In I875b9f2fc32c252acdcf8374a14067836e0f1ac6 with SHA-1 9a7bd79ca3 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21296639

Change-Id: I2805607dbdb185abf234d3002bc6cf3eeda917e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-06 21:41:36 +00:00
Iavor-Valentin Iftime
47130733e3 [automerger skipped] Merge "[DO NO MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into rvc-dev am: 450cacbee4 am: e116e63a91 -s ours am: 91ade78763 -s ours am: 89c9dc07df -s ours am: 7a997113d1 -s ours am: 5cd3dc7d1d -s ours am: 64ed6231d7 -s ours 
am skip reason: Merged-In I875b9f2fc32c252acdcf8374a14067836e0f1ac6 with SHA-1 9a7bd79ca3 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21296639

Change-Id: I17328bdff6629464c78592983be1792889192d6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-06 21:38:22 +00:00
Iavor-Valentin Iftime
66b0c4e41b [automerger skipped] Merge "[DO NO MERGE] Enforce INTERACT_ACROSS_USERS_FULL permission for NotificationAccessDetails" into rvc-dev am: 450cacbee4 am: e116e63a91 -s ours am: 91ade78763 -s ours am: 89c9dc07df -s ours am: 7a997113d1 -s ours am: 5cd3dc7d1d -s ours 
am skip reason: Merged-In I875b9f2fc32c252acdcf8374a14067836e0f1ac6 with SHA-1 9a7bd79ca3 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21296639

Change-Id: I2782cddd33dfa11c0dc1c51b6936776075e4d638
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-06 21:06:55 +00:00