PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
127,494 Commits 1 Branch 0 Tags
fdaf76622e8fc36e2b06597c0760dc8d5af9d78c
Commit Graph

127494 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chun-Ku Lin
a1fe1ef36e Change the settings value and wait for it to propagate. 
**Root cause**
Two reasons of the flaky test:
- Settings value not reset to default after tests
- Need time for the settings value changes to propagate to its listeners

Other clean up: When creating a preference, by default it will store
values in the shared preferences. If we don't intent to save the
preference to the sharedPreferences, we should set presistent as false.

Bug: 279818352
Test: atest
SettingsUnitTests:com.android.settings.accessibility.DisableAnimationsPreferenceControllerTest#onStart_disabledAnimation_shouldReturnTrue
--iterations 50

Change-Id: Ie645f8e847fc8ce188a7e5ed45bf5050f81e1d9a
 2023-05-15 19:45:24 +00:00
ykhung
5b04befc0e Remove useless optimization mode backup for FULL_POWER_LIST am: 2c125d29a3 am: 7a343c34d9 am: 41e31530cf am: 0397c254d2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23240822

Change-Id: Ic77bb10cc643f1cb44fc1bcbe8b3028544d2892f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 19:43:41 +00:00
Ankita Vyas
d2468db140 Merge "Fetch summary only if feature is available" into udc-dev am: 44a613438b am: 837adaafd8 am: cb2d59acdc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23240819

Change-Id: I63134d1c3b0502bd74f5df4c62747c6839cb4035
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 18:59:49 +00:00
Ankita Vyas
a32a3f0322 Merge "Fetch summary only if feature is available" into udc-dev am: 44a613438b am: a988b414bd am: 4e40d8a92b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23240819

Change-Id: I075b5789013fd85deaf5955b5ea85a674d3e6f12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 18:59:36 +00:00
ykhung
8821376541 Remove useless optimization mode backup for FULL_POWER_LIST am: 2c125d29a3 am: 852e9908ad am: f0d13a70fc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23240822

Change-Id: Ic6a7f8c9d667bf21a0ad0810d79a11b761064c1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 18:59:23 +00:00
ykhung
0397c254d2 Remove useless optimization mode backup for FULL_POWER_LIST am: 2c125d29a3 am: 7a343c34d9 am: 41e31530cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23240822

Change-Id: Ic953b49055b23ee0ebf04a0ed8cd1630039c0cbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 18:58:34 +00:00
Ankita Vyas
cb2d59acdc Merge "Fetch summary only if feature is available" into udc-dev am: 44a613438b am: 837adaafd8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23240819

Change-Id: I2206e4a680b57f60faecb8584a0768a1fdebb641
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 18:22:51 +00:00
Ankita Vyas
4e40d8a92b Merge "Fetch summary only if feature is available" into udc-dev am: 44a613438b am: a988b414bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23240819

Change-Id: I7c8cfa09021bb0660622486d6096ff4ca5612c3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 18:21:25 +00:00
ykhung
f0d13a70fc Remove useless optimization mode backup for FULL_POWER_LIST am: 2c125d29a3 am: 852e9908ad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23240822

Change-Id: Ieb1c749eb112609fb9036874c81a81c553c21fd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 18:20:25 +00:00
Ankita Vyas
27e7ae2d57 Merge "Fetch summary only if feature is available" into udc-dev am: 44a613438b am: 764f116e2b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23240819

Change-Id: I179df0d7712576f882e83cc1343e5c8530df7a67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 18:18:58 +00:00
ykhung
89d49129c1 Remove useless optimization mode backup for FULL_POWER_LIST am: 2c125d29a3 am: 147033c85c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23240822

Change-Id: Ib95cb6bcc579c19a16f670adecba7ba91bae6468
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 18:16:32 +00:00
ykhung
41e31530cf Remove useless optimization mode backup for FULL_POWER_LIST am: 2c125d29a3 am: 7a343c34d9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23240822

Change-Id: I2677dea8712a8dbe39521d709c50137fe567e4cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 18:15:43 +00:00
Ankita Vyas
764f116e2b Merge "Fetch summary only if feature is available" into udc-dev am: 44a613438b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23240819

Change-Id: I05a560539a09d3618f3608c554f449b5c4903b2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 18:00:43 +00:00
Ankita Vyas
837adaafd8 Merge "Fetch summary only if feature is available" into udc-dev am: 44a613438b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23240819

Change-Id: I568f0902f321d9bfc4ea6d421cef51ae63834dcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 17:59:00 +00:00
Ankita Vyas
a988b414bd Merge "Fetch summary only if feature is available" into udc-dev am: 44a613438b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23240819

Change-Id: Iec1502a51e7a96073aaaba2691cc41943bf0ae69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 17:37:23 +00:00
Ankita Vyas
44a613438b Merge "Fetch summary only if feature is available" into udc-dev 2023-05-15 17:37:11 +00:00
ykhung
7a343c34d9 Remove useless optimization mode backup for FULL_POWER_LIST am: 2c125d29a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23240822

Change-Id: I5e0eefdb421970cc0c405666db0e8b629e2423e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 17:36:41 +00:00
ykhung
147033c85c Remove useless optimization mode backup for FULL_POWER_LIST am: 2c125d29a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23240822

Change-Id: I4fb700f5e002d69abf4d8acf68fdcce6a18a20d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 17:36:02 +00:00
ykhung
852e9908ad Remove useless optimization mode backup for FULL_POWER_LIST am: 2c125d29a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23240822

Change-Id: I3b954248d7edcdb0f3b909ccdc3e2c64c2b1ff04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 17:35:49 +00:00
ykhung
2c125d29a3 Remove useless optimization mode backup for FULL_POWER_LIST 
Remove the useless backup for the FULL_POWER_LIST, since we will not use
it to restore data, only backup the optimization_mode_list is enough

Test: presubmit
Bug: 192523697
Change-Id: I95f1f41732b8aff090e8b722896d153f6181a6ac
 2023-05-15 23:45:16 +08:00
ykhung
2db6db8804 Disable the optimization mode preference if the app is not settable am: 5cd3a7298e am: 094281617f am: 29bc0d33d2 am: 797ddde2db 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23235859

Change-Id: I9ca4e6bcb94d0837cb2245f177f94a6d13ea753f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 15:12:15 +00:00
ykhung
94feb79b1d Disable the optimization mode preference if the app is not settable am: 5cd3a7298e am: d056edc15c am: 55ef64a3c8 am: 18deadcf1d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23235859

Change-Id: I5b76a1f4637963405cf3a5333019e29743840c9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 15:11:09 +00:00
ykhung
797ddde2db Disable the optimization mode preference if the app is not settable am: 5cd3a7298e am: 094281617f am: 29bc0d33d2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23235859

Change-Id: I90efd2e4ebde440463f41a0bc8ac21b90ca5421d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 14:26:11 +00:00
ykhung
18deadcf1d Disable the optimization mode preference if the app is not settable am: 5cd3a7298e am: d056edc15c am: 55ef64a3c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23235859

Change-Id: If5f5d1400b94e4fad239f8143fbaa87d54b55086
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 14:24:13 +00:00
Ankita Vyas
98e4d7bf16 Fetch summary only if feature is available 
onResume(loads summary) of controller seems to be invoked even when availabilty status
is unspported.

Bug: 278294334
Test: manual
Change-Id: I2486a7d61bea1b981ae56f0ff32b9d411be2ad14
 2023-05-15 13:31:38 +00:00
ykhung
29bc0d33d2 Disable the optimization mode preference if the app is not settable am: 5cd3a7298e am: 094281617f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23235859

Change-Id: Ic22dabcfa9f9cb20bb8ec4c953be884a0b2c844b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 13:26:12 +00:00
ykhung
f082d4eff1 Disable the optimization mode preference if the app is not settable am: 5cd3a7298e am: 5b7e06bd54 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23235859

Change-Id: Id0fda90e1bc66bf8709e2524d187c2d58864fb59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 13:21:30 +00:00
ykhung
55ef64a3c8 Disable the optimization mode preference if the app is not settable am: 5cd3a7298e am: d056edc15c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23235859

Change-Id: I2520f65c4290bbb113bca305e7f84eb0844e3da4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 13:21:25 +00:00
ykhung
d056edc15c Disable the optimization mode preference if the app is not settable am: 5cd3a7298e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23235859

Change-Id: I9d81ec00c5f5df7771f28f6bdc4775b7fdba987e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 12:43:08 +00:00
ykhung
5b7e06bd54 Disable the optimization mode preference if the app is not settable am: 5cd3a7298e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23235859

Change-Id: I2fcd5233d90b56ee796e4276ccd44918e0cdabd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 12:42:54 +00:00
ykhung
094281617f Disable the optimization mode preference if the app is not settable am: 5cd3a7298e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23235859

Change-Id: Ic7eb5e46f65c782b0f8922464a126f39c31dd3fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 12:39:04 +00:00
Treehugger Robot
3aca52d589 Merge "work challenge: allow backgroud biometric auth" into udc-dev am: 62193a6f56 am: 43cbfa4229 am: 8b0483b0c5 am: 3fd07baf3c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23211177

Change-Id: I486a8b83f60a417674ab5973dfc91e23decbb1fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 10:19:48 +00:00
Treehugger Robot
996991e44f Merge "Add allowlist mechanism for battery optimization mode" into udc-dev am: 2b91f1a4cb am: 2150660ddc am: ff067bcce0 am: 6d7a8f32bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23216878

Change-Id: I582a77a55018278c9c2831b413824d195ad86ef8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 10:19:28 +00:00
Treehugger Robot
2825289263 Merge "work challenge: allow backgroud biometric auth" into udc-dev am: 62193a6f56 am: 3263566899 am: 1e83ce4e35 am: 324d646904 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23211177

Change-Id: I7c9c1d3dd374c7044de207cb4ca5c5f41c8c9c87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 10:18:08 +00:00
Treehugger Robot
e68c833d1b Merge "Add allowlist mechanism for battery optimization mode" into udc-dev am: 2b91f1a4cb am: 14ebb061bc am: 9cb3635c45 am: 25399ea2c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23216878

Change-Id: I24a42b970541c1fc72adbc256a8e62702f7d5385
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 10:15:40 +00:00
ykhung
5cd3a7298e Disable the optimization mode preference if the app is not settable 
https://screenshot.googleplex.com/BbQyEv6YCjPVwUF (allowlist)
https://screenshot.googleplex.com/3hTb8TQwGMQqcwS
https://screenshot.googleplex.com/6hdTAT2yNFucD9N (system app)
https://screenshot.googleplex.com/77T5JyAD5nZJpDT (normal app)

Fix: 281566984
Test: make test RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.*
Change-Id: If7aa4b61bc806daa570187da24b7f454cd069dec
 2023-05-15 09:32:09 +00:00
Treehugger Robot
3fd07baf3c Merge "work challenge: allow backgroud biometric auth" into udc-dev am: 62193a6f56 am: 43cbfa4229 am: 8b0483b0c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23211177

Change-Id: Ib7c26af8cc1fc35efc1cdb15ad2db9743e89f51c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 09:31:33 +00:00
Treehugger Robot
6d7a8f32bd Merge "Add allowlist mechanism for battery optimization mode" into udc-dev am: 2b91f1a4cb am: 2150660ddc am: ff067bcce0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23216878

Change-Id: I14d704925d8db31f17b2011960f10f7ab63b1ea1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 09:30:36 +00:00
Treehugger Robot
324d646904 Merge "work challenge: allow backgroud biometric auth" into udc-dev am: 62193a6f56 am: 3263566899 am: 1e83ce4e35 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23211177

Change-Id: Icccf75eda15dc56641dce4eb27de05dc1efaae92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 09:29:50 +00:00
Treehugger Robot
25399ea2c1 Merge "Add allowlist mechanism for battery optimization mode" into udc-dev am: 2b91f1a4cb am: 14ebb061bc am: 9cb3635c45 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23216878

Change-Id: Ie0ceb1449afcf0223d4e0a3fed1fad105a61ec3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 09:29:07 +00:00
Treehugger Robot
8b0483b0c5 Merge "work challenge: allow backgroud biometric auth" into udc-dev am: 62193a6f56 am: 43cbfa4229 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23211177

Change-Id: Ief693b107c0102bbacf1d6f89127e1aa116ec11f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 09:09:56 +00:00
Treehugger Robot
ff067bcce0 Merge "Add allowlist mechanism for battery optimization mode" into udc-dev am: 2b91f1a4cb am: 2150660ddc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23216878

Change-Id: I3cc19cbd68234046e2288d64e2f09ce12e700976
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 09:09:16 +00:00
Treehugger Robot
f575b51ce1 Merge "work challenge: allow backgroud biometric auth" into udc-dev am: 62193a6f56 am: 267a9a14bf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23211177

Change-Id: Iad60145324234afaa488ca9328dcecfc493c1c52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 09:09:13 +00:00
Treehugger Robot
5ed44db1d8 Merge "Add allowlist mechanism for battery optimization mode" into udc-dev am: 2b91f1a4cb am: dda7021b4b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23216878

Change-Id: I807642570d0ad968320c709167b3cce18977a5b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 09:08:29 +00:00
Treehugger Robot
1e83ce4e35 Merge "work challenge: allow backgroud biometric auth" into udc-dev am: 62193a6f56 am: 3263566899 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23211177

Change-Id: I843e88f614fa1f78fe1dd27d48efda7cc83c54b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 08:53:54 +00:00
Treehugger Robot
9cb3635c45 Merge "Add allowlist mechanism for battery optimization mode" into udc-dev am: 2b91f1a4cb am: 14ebb061bc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23216878

Change-Id: I87f6c1ccb62fb8a36260c812ab59e71a39532c07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 08:51:54 +00:00
Treehugger Robot
267a9a14bf Merge "work challenge: allow backgroud biometric auth" into udc-dev am: 62193a6f56 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23211177

Change-Id: Ib4f5c3a9456150db0d52ee8118a889466fb5cc63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 08:31:30 +00:00
Treehugger Robot
43cbfa4229 Merge "work challenge: allow backgroud biometric auth" into udc-dev am: 62193a6f56 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23211177

Change-Id: I2e2d3804816b994073f29ea90d3e5b64f7044eb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 08:31:22 +00:00
Treehugger Robot
2150660ddc Merge "Add allowlist mechanism for battery optimization mode" into udc-dev am: 2b91f1a4cb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23216878

Change-Id: Id149ac65a51676e1622a023ab3159ea2c0ecc731
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 08:31:04 +00:00
Treehugger Robot
dda7021b4b Merge "Add allowlist mechanism for battery optimization mode" into udc-dev am: 2b91f1a4cb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23216878

Change-Id: Id805deb60d45f25c0f01174328a76dc5b4c2011b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 08:30:59 +00:00