PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
122,911 Commits 1 Branch 0 Tags
b1582f79ce2d59b03c8d953d2e8cf2227e779ca1
Commit Graph

122911 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Huang
b1582f79ce Merge "Handling multiple profiles for PK layout selection" into udc-dev am: 5f3e365c41 am: 717f21edad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22371401

Change-Id: Ib905addab50be021c62d7645655a44336baa6138
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 07:53:34 +00:00
Daniel Huang
80dba035d9 Merge "Handling multiple profiles for PK layout selection" into udc-dev am: 5f3e365c41 am: 9bbc2099ec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22371401

Change-Id: I37e316d9cc483a33bb915449a27315bb3726dd9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 07:53:25 +00:00
Daniel Huang
9bbc2099ec Merge "Handling multiple profiles for PK layout selection" into udc-dev am: 5f3e365c41 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22371401

Change-Id: I6b53e58b678d864a40610115cd356dbe7074d03f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 07:25:05 +00:00
Daniel Huang
717f21edad Merge "Handling multiple profiles for PK layout selection" into udc-dev am: 5f3e365c41 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22371401

Change-Id: I26b6df67c06480c6a4b5745cf8d92b90d8016721
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 07:22:36 +00:00
Daniel Huang
5f3e365c41 Merge "Handling multiple profiles for PK layout selection" into udc-dev 2023-04-06 06:52:18 +00:00
Automerger Merge Worker
8996b725d4 Merge "[automerger skipped] Merge "Refine permission check process of 2-pane deep link" into tm-qpr-dev am: d0b0aeb2ba am: 2e82189b1a -s ours am: b286a740ff -s ours am: 9c39398d7a -s ours" 2023-04-06 04:20:45 +00:00
Jason Chiu
f33fdc4586 [automerger skipped] Merge "Refine permission check process of 2-pane deep link" into tm-qpr-dev am: d0b0aeb2ba am: 2e82189b1a -s ours am: b286a740ff -s ours am: 9c39398d7a -s ours 
am skip reason: Merged-In Ie69742983fb74ee2316b7aad16461db95ed927c2 with SHA-1 5310c40640 is already in history

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

Change-Id: Ib34e3700c176375677ab79167a723d359b4db940
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 04:19:23 +00:00
Jason Chiu
5027240a87 [automerger skipped] Merge "Refine permission check process of 2-pane deep link" into tm-qpr-dev am: d0b0aeb2ba am: 2e82189b1a -s ours am: b286a740ff -s ours am: 91ebc0d97c -s ours 
am skip reason: Merged-In Ie69742983fb74ee2316b7aad16461db95ed927c2 with SHA-1 5310c40640 is already in history

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

Change-Id: I9b173e135b19cad8bbde88f7d1929cd2a4e1d043
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 04:19:14 +00:00
Jason Chiu
91ebc0d97c [automerger skipped] Merge "Refine permission check process of 2-pane deep link" into tm-qpr-dev am: d0b0aeb2ba am: 2e82189b1a -s ours am: b286a740ff -s ours 
am skip reason: Merged-In Ie69742983fb74ee2316b7aad16461db95ed927c2 with SHA-1 5310c40640 is already in history

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

Change-Id: Ib0e4a3cb905e7a62750a75eb1f5f21d76c2a9b63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 03:53:36 +00:00
Jason Chiu
9c39398d7a [automerger skipped] Merge "Refine permission check process of 2-pane deep link" into tm-qpr-dev am: d0b0aeb2ba am: 2e82189b1a -s ours am: b286a740ff -s ours 
am skip reason: Merged-In Ie69742983fb74ee2316b7aad16461db95ed927c2 with SHA-1 5310c40640 is already in history

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

Change-Id: I71fad690a350ce0372c63c00136d699a9980552f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 03:53:14 +00:00
Jason Chiu
b286a740ff [automerger skipped] Merge "Refine permission check process of 2-pane deep link" into tm-qpr-dev am: d0b0aeb2ba am: 2e82189b1a -s ours 
am skip reason: Merged-In Ie69742983fb74ee2316b7aad16461db95ed927c2 with SHA-1 5310c40640 is already in history

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

Change-Id: Ibd08062eda8fed1d32aeb7fb06faa907ae13ff7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 03:22:25 +00:00
Jason Chiu
2e82189b1a Merge "Refine permission check process of 2-pane deep link" into tm-qpr-dev am: d0b0aeb2ba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22214366

Change-Id: Icba9b653141d016945a5f999e1f324473d6bd1c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 02:51:54 +00:00
Jason Chiu
d0b0aeb2ba Merge "Refine permission check process of 2-pane deep link" into tm-qpr-dev 2023-04-06 02:24:16 +00:00
Jason Chiu
4f7205b2ea Refine permission check process of 2-pane deep link 
- Check the deep link activity instance before redirecting to the
  internal activity for the managed profile invocation, so the caller
  can't bypass the permission check.
- Get the referrer as the caller so that onNewIntent can recognize the
  new caller and check if it has a permission to open the target page.

Test: robotest & manual
Bug: 268193384
Bug: 272437506
Change-Id: Ie69742983fb74ee2316b7aad16461db95ed927c2
Merged-In: Ie69742983fb74ee2316b7aad16461db95ed927c2
 2023-04-06 02:22:45 +00:00
Automerger Merge Worker
3cee20dd5a Merge "Merge "Do isAvailable() checks when accessing AirplaneEnabler." into udc-dev am: b232ba29e6 am: 22a94c2b0e" 2023-04-06 01:07:19 +00:00
TreeHugger Robot
c1cdb4ae69 Merge "Do isAvailable() checks when accessing AirplaneEnabler." into udc-dev am: b232ba29e6 am: e4c7e5b424 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21725541

Change-Id: Ib543f8bce09153d65c0b21861a42c58b4d100385
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 01:07:07 +00:00
TreeHugger Robot
bfa3775046 Merge "Do isAvailable() checks when accessing AirplaneEnabler." into udc-dev am: b232ba29e6 am: 22a94c2b0e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21725541

Change-Id: I381e3e8fc5205cb1e4a758782dc2d3697c4180ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 01:06:21 +00:00
danielwbhuang
2659074d02 Handling multiple profiles for PK layout selection 
1. Use new @hide IMM#getEnabledInputMethodSubtypeListAsUser()
2. Use ProfileSelectFragment

Demo: https://screencast.googleplex.com/cast/NjMzNTA2NTA2NDczNDcyMHwxNTUyMjQ1ZS03YQ

Bug: 275106096
Test: manual
Change-Id: I51cfd16fc7162e2b24782017b9366b0aad36f915
 2023-04-06 00:50:54 +00:00
TreeHugger Robot
22a94c2b0e Merge "Do isAvailable() checks when accessing AirplaneEnabler." into udc-dev am: b232ba29e6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21725541

Change-Id: Ie63ee4c774bd4af9c58f9af0caface1b4fd1481c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 00:37:49 +00:00
TreeHugger Robot
e4c7e5b424 Merge "Do isAvailable() checks when accessing AirplaneEnabler." into udc-dev am: b232ba29e6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21725541

Change-Id: Ic9f27eb0e6eba63b719edcb31a0cc54909d4fd8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 00:37:40 +00:00
TreeHugger Robot
b232ba29e6 Merge "Do isAvailable() checks when accessing AirplaneEnabler." into udc-dev 2023-04-06 00:01:47 +00:00
Ben Lin
72534295d3 Do isAvailable() checks when accessing AirplaneEnabler. 
This instance is only initialized if isAvailable() returns true in the
first place, so we should check for it everytime we try to access it, or
else we will result in a NPE.

Bug: 271223463
Test: atest AirplaneModePreferenceControllerTest
Change-Id: I43d35b91c86517201c8ec4f458f8c0328a9fb768
 2023-04-05 22:34:16 +00:00
Brian Lee
a2cacc7f27 Add RemoteLockscreenValidationFragment to help retain remote lockscreen am: 2eb8ed2488 am: e1fa9effbc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22390454

Change-Id: I628c26b2e97e56e924d86049d82f1027554615e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 22:21:18 +00:00
Brian Lee
bd0b938ea6 Add RemoteLockscreenValidationFragment to help retain remote lockscreen am: 2eb8ed2488 am: 95178742b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22390454

Change-Id: Ib733e78ec419e9b4f36b7c8a49a0ffa37104025e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 22:15:02 +00:00
Brian Lee
e1fa9effbc Add RemoteLockscreenValidationFragment to help retain remote lockscreen am: 2eb8ed2488 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22390454

Change-Id: I38ebb1bb199f6c9859d247a28c44ccb5868ccffa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 18:48:38 +00:00
Brian Lee
95178742b3 Add RemoteLockscreenValidationFragment to help retain remote lockscreen am: 2eb8ed2488 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22390454

Change-Id: I58487aef2bc252448119e48c7a2f2bedc3a710b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 18:35:29 +00:00
TreeHugger Robot
12276ad95c Merge "Update Security & Privacy top-level settings icon." into udc-dev am: be16edbe06 am: f58610ebe7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425556

Change-Id: I15ba2f2c4600136c5e84b16b99194bd9111610fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 18:18:24 +00:00
Vania Januar
e83f72adc9 Merge "Fix broken test for stylus button Settings." into udc-dev am: a07ff94f83 am: 1194f74dbd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22252124

Change-Id: I8d56091ade399a01caa87068ffbead28ff2f4d86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 18:14:03 +00:00
TreeHugger Robot
f58610ebe7 Merge "Update Security & Privacy top-level settings icon." into udc-dev am: be16edbe06 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425556

Change-Id: Ifc78cbcbd8e4d3658a1dd028777b2103653304fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 17:59:46 +00:00
Vania Januar
1194f74dbd Merge "Fix broken test for stylus button Settings." into udc-dev am: a07ff94f83 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22252124

Change-Id: I00c5fdfe6f32fe91badad161719a373ee7b59f24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 17:56:46 +00:00
Lucas Dupin
08c1bb045b Merge "Add contrast setting in dev options" into udc-dev am: 222a89acc1 am: 99ddb6079c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425568

Change-Id: I41d5f076c3fdf9b8d6ca8c2e991a34c1a0deee25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 17:42:03 +00:00
Bill Yi
a0fc369c04 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fa4e2c72af -s ours am: 1326cea122 -s ours am: ceb8476a1d -s ours am: 75102af90a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idf82a2c713d947660c9df093df17575dbd72058b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 17:34:12 +00:00
Lucas Dupin
99ddb6079c Merge "Add contrast setting in dev options" into udc-dev am: 222a89acc1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425568

Change-Id: I7e1fa01abd22b653ff1f1b1267c189cc09480100
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 17:12:21 +00:00
Bill Yi
75102af90a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fa4e2c72af -s ours am: 1326cea122 -s ours am: ceb8476a1d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0f3c586495b0298346b73d007c2d3d1e71323ef1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 17:08:56 +00:00
Brian Lee
2eb8ed2488 Add RemoteLockscreenValidationFragment to help retain remote lockscreen 
validation state.

Currently, if ConfirmDeviceCredentialBaseFragment is ever re-created due
to orientation change, screen getting turned off, etc., relevant state
gets lost. This led to the old ConfirmDeviceCredentialBaseFragment
handling results which led to issues such as lockscreen not getting set.
By addiing a retained RemoteLockscreenValidationFragment,
we're able to update the new ConfirmDeviceCredentialBaseFragment
that will handle results. We can also retain other important state like
the device credential guess to be set after successful validation.

Some smaller changes include:
* If the activity is finished for any reason other than "Back" getting
  pressed, RESULT_FIRST_USER is returned instead of RESULT_CANCELED.
* CheckBox, "Forgot [LSKF]?" button, and EditText/LockPatternView
  gets disabled during validation.
* The above also stay disabled if ConfirmDeviceCredentialBaseFragment
  gets re-created and remote lockscreen validation is still in progress.

Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=com.android.settings.password
Test: Manual
Bug: 274983372
Bug: 274991889
Bug: 274792310
Bug: 270395807

Change-Id: Ib6d47430e233a43e6985ab83abae45713c49771f
 2023-04-05 16:35:25 +00:00
TreeHugger Robot
400ccf5d30 Merge "Update Security & Privacy top-level settings icon." into udc-dev am: be16edbe06 am: 08345b579f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425556

Change-Id: I7abbdc3943ead2a772d3035053e9a7b714fff0bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 13:17:22 +00:00
TreeHugger Robot
08345b579f Merge "Update Security & Privacy top-level settings icon." into udc-dev am: be16edbe06 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425556

Change-Id: I6f6c054dfcfba7d81214c05ff241a58f559587e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 12:49:31 +00:00
TreeHugger Robot
be16edbe06 Merge "Update Security & Privacy top-level settings icon." into udc-dev 2023-04-05 12:05:44 +00:00
Vania Januar
59070de15a Merge "Fix broken test for stylus button Settings." into udc-dev am: a07ff94f83 am: 6a8a92254b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22252124

Change-Id: I37bee0588e10e15eb15bdfd4207f8113ddde4782
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 10:46:21 +00:00
Vania Januar
6a8a92254b Merge "Fix broken test for stylus button Settings." into udc-dev am: a07ff94f83 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22252124

Change-Id: Ie51260d644afe0017efc61089def6ba05b25087f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 10:18:26 +00:00
Vania Januar
a07ff94f83 Merge "Fix broken test for stylus button Settings." into udc-dev 2023-04-05 09:46:25 +00:00
Lucas Dupin
24489fc790 Merge "Add contrast setting in dev options" into udc-dev am: 222a89acc1 am: ef4ca344b8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425568

Change-Id: I7ec23652c8ddbe56f20b6d6ede2dbda87883c3be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 03:19:18 +00:00
Lucas Dupin
ef4ca344b8 Merge "Add contrast setting in dev options" into udc-dev am: 222a89acc1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425568

Change-Id: I1f2c4cfbcf69d99f47c6f477b767f67fa7f4edbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 02:51:18 +00:00
Lucas Dupin
222a89acc1 Merge "Add contrast setting in dev options" into udc-dev 2023-04-05 02:08:14 +00:00
Bill Yi
5865c4c547 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fa4e2c72af -s ours am: 1326cea122 -s ours am: ceb8476a1d -s ours am: a6a336c33d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I02cd8c30dc08912aeba2781dd185d03dee703344
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 00:38:22 +00:00
Bill Yi
a6a336c33d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fa4e2c72af -s ours am: 1326cea122 -s ours am: ceb8476a1d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I28f8d97e0e998834588257dbd88636b1057bc64a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 00:22:33 +00:00
Bill Yi
ceb8476a1d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fa4e2c72af -s ours am: 1326cea122 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iac91a75f89dfacc717c722da6af189684e993247
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 00:08:38 +00:00
Bill Yi
1326cea122 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fa4e2c72af -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibbda26cecd84afdd5938309bfa247528cf8a3e96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 23:38:51 +00:00
Dmitry Dementyev
54da901eb5 Merge "Return GK_PW_HANDLE after remote LSKF verification." into udc-dev am: cd7123e071 am: f093db202e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21993732

Change-Id: I2f845cb1f1ea313b628bdeb0d3bc3482ed6779c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 19:39:27 +00:00
Dmitry Dementyev
772e53bd2f Merge "Return GK_PW_HANDLE after remote LSKF verification." into udc-dev am: cd7123e071 am: 822c670619 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21993732

Change-Id: Ib8e49dd5635fc3a34df3a2d2ec6109b91781d05d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 19:39:16 +00:00