Tsung-Mao Fang
29d285e4e1
[automerger skipped] [DO NOT MERGE] FRP bypass defense in the settings app am: b34ff2f272
-s ours am: c923d29c08
-s ours am: e57ce41bf1
-s ours am: d9b063c4a8
-s ours am: 8c9e74c6c1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20641137
Change-Id: Ie3efc579482719dcbfbcb6ab0c67e66f9224573a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-04 04:29:31 +00:00
Tsung-Mao Fang
8c9e74c6c1
[automerger skipped] [DO NOT MERGE] FRP bypass defense in the settings app am: b34ff2f272
-s ours am: c923d29c08
-s ours am: e57ce41bf1
-s ours am: d9b063c4a8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20641137
Change-Id: I7cc9e28d5c9c22cbfc4394a9fdc1214b8ac06c57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-04 03:56:22 +00:00
Tsung-Mao Fang
d9b063c4a8
[automerger skipped] [DO NOT MERGE] FRP bypass defense in the settings app am: b34ff2f272
-s ours am: c923d29c08
-s ours am: e57ce41bf1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20641137
Change-Id: Ia2cffee6eed121dbf8b581eff8eb1c848c1eae78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-04 03:27:36 +00:00
Arc Wang
55b67a4bf8
[automerger skipped] Merge changes from topic "presubmit-am-8c4ee5d0c6b544bab2b8403178df17cc-sc-qpr1-dev-sc-dev" into sc-qpr1-dev am: 4b12201ec4
-s ours am: 57643513e3
-s ours am: 8cf511b709
-s ours
...
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 22869d9019
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20640996
Change-Id: I7eb88dfd26c506988803fac3a28229616e397c32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-04 02:54:49 +00:00
Tsung-Mao Fang
4e8fb935d3
[automerger skipped] [automerge] FRP bypass defense in the settings app 2p: 71f2d83688
am: 1ebb665b71
-s ours am: fc17db496f
-s ours am: ee39631cdb
-s ours
...
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 22869d9019
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20640996
Change-Id: I0566782a245a997cc129eff2673c4d09daf6467b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-04 02:54:47 +00:00
Tsung-Mao Fang
29b9f7857c
[automerger skipped] FRP bypass defense in the settings app am: 22869d9019
-s ours am: 9764e1f9fd
-s ours am: 0f05806ab5
-s ours
...
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 1cf31d17aa
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20640995
Change-Id: I2c52e0b97adf20dc02ed3922dc9d8f2033f7e50b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-04 02:54:40 +00:00
Arc Wang
0f074fcd04
[automerger skipped] Merge "FRP bypass defense in the settings app" into sc-v2-dev am: 9a6c84c47e
-s ours am: eeafd49d4e
-s ours
...
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 07dd833a6a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20640992
Change-Id: I7989a963eed917ee48144bad7efbc034405aa7a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-04 02:54:33 +00:00
Tsung-Mao Fang
d48037d603
[automerger skipped] FRP bypass defense in the settings app am: 1cf31d17aa
-s ours am: b8fd889067
-s ours
...
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 07dd833a6a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20640992
Change-Id: I929db16861e70afcd078ed6f20a7de1957289004
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-04 02:54:31 +00:00
Tsung-Mao Fang
e57ce41bf1
[automerger skipped] [DO NOT MERGE] FRP bypass defense in the settings app am: b34ff2f272
-s ours am: c923d29c08
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20641137
Change-Id: I19e026e0dccec0e45dbc02fb926fda24c3c45f3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-04 02:52:10 +00:00
Arc Wang
8cf511b709
[automerger skipped] Merge changes from topic "presubmit-am-8c4ee5d0c6b544bab2b8403178df17cc-sc-qpr1-dev-sc-dev" into sc-qpr1-dev am: 4b12201ec4
-s ours am: 57643513e3
-s ours
...
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 22869d9019
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20640996
Change-Id: I8bf03238620201496af8077768303e1fbbdb16d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-04 02:36:24 +00:00
Tsung-Mao Fang
ee39631cdb
[automerger skipped] [automerge] FRP bypass defense in the settings app 2p: 71f2d83688
am: 1ebb665b71
-s ours am: fc17db496f
-s ours
...
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 22869d9019
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20640996
Change-Id: I1d1009c07ea93deac60efb8fc1467bf95f074a65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-04 02:36:21 +00:00
Tsung-Mao Fang
0f05806ab5
[automerger skipped] FRP bypass defense in the settings app am: 22869d9019
-s ours am: 9764e1f9fd
-s ours
...
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 1cf31d17aa
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20640995
Change-Id: Ibe913743375e295c5fcc2e2acbbc4f90f8c65eac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-04 02:36:12 +00:00
Arc Wang
57643513e3
[automerger skipped] Merge changes from topic "presubmit-am-8c4ee5d0c6b544bab2b8403178df17cc-sc-qpr1-dev-sc-dev" into sc-qpr1-dev am: 4b12201ec4
-s ours
...
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 22869d9019
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20640996
Change-Id: I1462714a0484f6a2dc310a9a8b079a6a7bac0e47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-04 02:21:28 +00:00
Tsung-Mao Fang
fc17db496f
[automerger skipped] [automerge] FRP bypass defense in the settings app 2p: 71f2d83688
am: 1ebb665b71
-s ours
...
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 22869d9019
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20640996
Change-Id: I02b849dc2f0705021a168985057ff725c9b9f415
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-04 02:21:27 +00:00
Tsung-Mao Fang
9764e1f9fd
[automerger skipped] FRP bypass defense in the settings app am: 22869d9019
-s ours
...
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 1cf31d17aa
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20640995
Change-Id: Iaa0029076d6b0eb1960b3a7c2d6abc49316e1b30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-04 02:21:08 +00:00
Arc Wang
eeafd49d4e
[automerger skipped] Merge "FRP bypass defense in the settings app" into sc-v2-dev am: 9a6c84c47e
-s ours
...
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 07dd833a6a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20640992
Change-Id: I07c9886a2bceaab3eccf3e1690ced01118240717
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-04 02:17:41 +00:00
Tsung-Mao Fang
b8fd889067
[automerger skipped] FRP bypass defense in the settings app am: 1cf31d17aa
-s ours
...
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 07dd833a6a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20640992
Change-Id: I326f27db0a1247719b08e84597051477baad4266
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-04 02:17:37 +00:00
Tsung-Mao Fang
c923d29c08
[automerger skipped] [DO NOT MERGE] FRP bypass defense in the settings app am: b34ff2f272
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20641137
Change-Id: Ic31163255a4a53af7b3473067afbd6e21ba11147
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-04 02:17:33 +00:00
Arc Wang
4b12201ec4
Merge changes from topic "presubmit-am-8c4ee5d0c6b544bab2b8403178df17cc-sc-qpr1-dev-sc-dev" into sc-qpr1-dev
...
* changes:
[automerge] FRP bypass defense in the settings app 2p: 71f2d83688
FRP bypass defense in the settings app
2023-01-04 01:52:01 +00:00
Arc Wang
9a6c84c47e
Merge "FRP bypass defense in the settings app" into sc-v2-dev
2023-01-04 01:51:22 +00:00
Yasin Kilicdere
b408ef540d
Merge "Remove the fallback AddSupervisedUserActivity." into tm-dev am: 15a89a60ac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20665167
Change-Id: Ie2670823d5820f75d101fc6236c8154869db88d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-03 12:52:43 +00:00
Yasin Kilicdere
15a89a60ac
Merge "Remove the fallback AddSupervisedUserActivity." into tm-dev
2023-01-03 12:18:58 +00:00
TreeHugger Robot
05e75b5f23
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-12-31 06:42:16 +00:00
TreeHugger Robot
d161ba7652
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-12-31 06:41:21 +00:00
Bill Yi
6f5f00347a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8736d107ef01c74fe10cde612a006ef37104bf75
2022-12-29 21:31:09 -08:00
Bill Yi
fb0de39122
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I152075aaac2023a4a16f7bd0bbe429a031265bd6
2022-12-29 21:30:04 -08:00
Bill Yi
c3804e1e0e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9a95da6b54a02999cced31a315494a2c39e9eb8b
2022-12-29 21:27:02 -08:00
TreeHugger Robot
ee6d6f0b2c
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-12-28 05:57:22 +00:00
TreeHugger Robot
207f86e5fe
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-12-28 05:55:46 +00:00
TreeHugger Robot
00ca7a0225
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-12-28 05:55:08 +00:00
Bill Yi
25fdb49733
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iabc7dc25bb3afb628bce68e45a2c7aee621f37f9
2022-12-21 07:37:28 -08:00
Bill Yi
73537f9258
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If3df884eb11d2ac2ec512bceb4dc04fa4d0d52d0
2022-12-21 07:35:59 -08:00
Bill Yi
d9cc6bd784
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2931d2ee4fc753012624af29773984b1e1a2b4af
2022-12-21 07:32:35 -08:00
Arc Wang
b169c48705
[automerger skipped] Check Uri permission for FLAG_GRANT_READ/WRITE_URI_PERMISSION am: 17cd85b946
-s ours am: cef3637f4c
-s ours
...
am skip reason: Merged-In I48f88c662b843212b1066369badff84cf98935a8 with SHA-1 0f7f913281
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20727213
Change-Id: I446292e27c1a8a2d278781b09cd1565626391106
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-21 07:43:47 +00:00
Arc Wang
a9f470ab46
[automerger skipped] Allow 2-pane deep link to access unexported Activity am: 960c96474d
-s ours am: e3a8b88137
-s ours
...
am skip reason: Merged-In I662df6cb287361b135e2c596abe946ddeb03bda4 with SHA-1 0498907322
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20690601
Change-Id: I0cfd1c8d60a552d44c13b32a262cb289bb970cf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-21 07:43:45 +00:00
Arc Wang
b7c98a18c9
Check Uri permission for FLAG_GRANT_READ/WRITE_URI_PERMISSION am: 0f7f913281
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20727211
Change-Id: Ida290c485f4867ca7fccd9639d9cb5c18b39f188
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-21 07:43:32 +00:00
Arc Wang
4703a5a61b
Allow 2-pane deep link to access unexported Activity
...
If an Activity is not exported, the Activity still can be
launched by components of the same application, applications
with the same user ID, or privileged system components.
Bug: 261678674
Bug: 250589026
Change-Id: I2c70271ac50c7bb5f0bb8275d079ed553f0e50b0
Merged-In: I662df6cb287361b135e2c596abe946ddeb03bda4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-19 03:34:42 +00:00
Arc Wang
cef3637f4c
[automerger skipped] Check Uri permission for FLAG_GRANT_READ/WRITE_URI_PERMISSION am: 17cd85b946
-s ours
...
am skip reason: Merged-In I48f88c662b843212b1066369badff84cf98935a8 with SHA-1 0f7f913281
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20727213
Change-Id: I93f85b0182921a010b4bd16f3d7116590144016c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-16 11:18:17 +00:00
Arc Wang
e3a8b88137
[automerger skipped] Allow 2-pane deep link to access unexported Activity am: 960c96474d
-s ours
...
am skip reason: Merged-In I662df6cb287361b135e2c596abe946ddeb03bda4 with SHA-1 0498907322
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20690601
Change-Id: I8e350dafebac6347f599d4fbb52100c8e8fa5474
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-16 11:18:13 +00:00
Arc Wang
0f7f913281
Check Uri permission for FLAG_GRANT_READ/WRITE_URI_PERMISSION
...
To improve security, calling app must be granted Uri permission
if it sets FLAG_GRANT_READ/WRITE_URI_PERMISSION in the Intent of
ACTION_SETTINGS_EMBED_DEEP_LINK_ACTIVITY.
Bug: 250589026
Test: manual
Change-Id: I48f88c662b843212b1066369badff84cf98935a8
Merged-In: I48f88c662b843212b1066369badff84cf98935a8
2022-12-15 03:41:53 +00:00
Arc Wang
17cd85b946
Check Uri permission for FLAG_GRANT_READ/WRITE_URI_PERMISSION
...
To improve security, calling app must be granted Uri permission
if it sets FLAG_GRANT_READ/WRITE_URI_PERMISSION in the Intent of
ACTION_SETTINGS_EMBED_DEEP_LINK_ACTIVITY.
Bug: 250589026
Test: manual
Change-Id: I48f88c662b843212b1066369badff84cf98935a8
Merged-In: I48f88c662b843212b1066369badff84cf98935a8
2022-12-15 03:41:33 +00:00
Bill Yi
76b6947b01
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iafeb061a5d1abe2bfb46fd617e858f315e042c67
2022-12-14 12:43:27 -08:00
Arc Wang
960c96474d
Allow 2-pane deep link to access unexported Activity
...
If an Activity is not exported, the Activity still can be
launched by components of the same application, applications
with the same user ID, or privileged system components.
Bug: 261678674
Bug: 250589026
Test: manual visual
Launcher -> context menu -> Wallpaper & style
Change-Id: I662df6cb287361b135e2c596abe946ddeb03bda4
Merged-In: I662df6cb287361b135e2c596abe946ddeb03bda4
2022-12-14 19:27:32 +08:00
Arc Wang
0498907322
Allow 2-pane deep link to access unexported Activity
...
If an Activity is not exported, the Activity still can be
launched by components of the same application, applications
with the same user ID, or privileged system components.
Bug: 261678674
Bug: 250589026
Test: manual visual
Launcher -> context menu -> Wallpaper & style
Change-Id: I662df6cb287361b135e2c596abe946ddeb03bda4
Merged-In: I662df6cb287361b135e2c596abe946ddeb03bda4
2022-12-14 19:17:40 +08:00
Bill Yi
2626acac3d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iade325b06bc425f65775d3f7ba406df31d63d818
2022-12-08 01:10:38 -08:00
Yasin Kilicdere
ee476cab18
Remove the fallback AddSupervisedUserActivity.
...
Rollback the changes done in ag/16388725 and ag/16709333
Bug: 209659998
Test: croot && make RunSettingsRoboTests -j40 ROBOTEST_FILTER="com.android.settings.users.UserSettingsTest"
Change-Id: I75b85df50a3caff55375ad261a97225377644a38
(cherry picked from commit 86f3500439
)
Fixes: 249057848
2022-12-07 15:23:37 +00:00
Tsung-Mao Fang
b34ff2f272
[DO NOT MERGE] FRP bypass defense in the settings app
...
Over the last few years, there have been a number of
Factory Reset Protection bypass bugs in the SUW flow.
It's unlikely to defense all points from individual apps.
Therefore, we decide to block some critical pages when
user doesn't complete the SUW flow.
Test: Can't open the certain pages in the suw flow.
Bug: 258422561
Fix: 200746457
Bug: 202975040
Fix: 213091525
Fix: 213090835
Fix: 201561699
Fix: 213090827
Fix: 213090875
Change-Id: Ia18f367109df5af7da0a5acad7702898a459d32e
Merged-In: Ia18f367109df5af7da0a5acad7702898a459d32e
2022-12-07 03:08:58 +00:00
Tsung-Mao Fang
1ebb665b71
[automerge] FRP bypass defense in the settings app 2p: 71f2d83688
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20640996
Bug: 258422561
Bug: 202975040
Change-Id: I33d8635f6695619b415285f67001135f695a880c
Merged-In: Ia18f367109df5af7da0a5acad7702898a459d32e
2022-12-06 11:45:18 +00:00
Tsung-Mao Fang
71f2d83688
FRP bypass defense in the settings app
...
Over the last few years, there have been a number of
Factory Reset Protection bypass bugs in the SUW flow.
It's unlikely to defense all points from individual apps.
Therefore, we decide to block some critical pages when
user doesn't complete the SUW flow.
Test: Can't open the certain pages in the suw flow.
Bug: 258422561
Fix: 200746457
Bug: 202975040
Fix: 213091525
Fix: 213090835
Fix: 201561699
Fix: 213090827
Fix: 213090875
Change-Id: Ia18f367109df5af7da0a5acad7702898a459d32e
Merged-In: Ia18f367109df5af7da0a5acad7702898a459d32e
2022-12-06 11:45:08 +00:00
Tsung-Mao Fang
22869d9019
FRP bypass defense in the settings app
...
Over the last few years, there have been a number of
Factory Reset Protection bypass bugs in the SUW flow.
It's unlikely to defense all points from individual apps.
Therefore, we decide to block some critical pages when
user doesn't complete the SUW flow.
Test: Can't open the certain pages in the suw flow.
Bug: 258422561
Fix: 200746457
Bug: 202975040
Fix: 213091525
Fix: 213090835
Fix: 201561699
Fix: 213090827
Fix: 213090875
Change-Id: Ia18f367109df5af7da0a5acad7702898a459d32e
Merged-In: Ia18f367109df5af7da0a5acad7702898a459d32e
2022-12-06 11:44:29 +00:00