Hugh Chen
23ab123ba7
[automerge] RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline 2p: 1c4142e1ae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18330690
Bug: 228450811
Change-Id: I8e1ee6a97b57934b553a962f8f459d3f6afd746e
2022-05-12 06:14:37 +00:00
Hugh Chen
1c4142e1ae
RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline
...
- Don't let device be discovered when the user launch "Connected Devices
settings" through SliceDeepLinkTrampoline.
Bug: 228450811
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify the device is not discoversable when open "Connected settings"
through test apk.
Change-Id: I5490b58675b1fd9fc36305766867f65caa6ccb6c
(cherry picked from commit 205752dcf2
)
2022-05-12 06:14:27 +00:00
Hugh Chen
663066691e
RESTRICT AUTOMERGE Make bluetooth not discoverable via SliceDeepLinkTrampoline
...
- Don't let device be discovered when the user launch "Connected Devices
settings" through SliceDeepLinkTrampoline.
Bug: 228450811
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify the device is not discoversable when open "Connected settings"
through test apk.
Change-Id: I5490b58675b1fd9fc36305766867f65caa6ccb6c
(cherry picked from commit 205752dcf2
)
2022-05-12 06:13:00 +00:00
Arc Wang
4daf31225d
[automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 640eab60f2
am: 3d9bdda678
-s ours am: ec921eea1a
-s ours am: f0065e3adf
-s ours am: 09c382d878
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219307
Change-Id: Id9d6ac8dba6e7e553207977138cf080dbd6dab53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 02:07:21 +00:00
Arc Wang
09c382d878
[automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 640eab60f2
am: 3d9bdda678
-s ours am: ec921eea1a
-s ours am: f0065e3adf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219307
Change-Id: Ibe47e367afe145e51e985c43ba64786ea980a9b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 01:43:25 +00:00
Arc Wang
f0065e3adf
[automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 640eab60f2
am: 3d9bdda678
-s ours am: ec921eea1a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219307
Change-Id: Iabdde708e9eb3a24bc2419bf34587cd3f8c23e0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 01:08:52 +00:00
Arc Wang
006b5b4102
[automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 1682354551
-s ours am: d47388ce79
-s ours am: 5f01cd3e3f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219306
Change-Id: Ifab9a89762869a57002057339e1e28244abd8ef7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 00:43:48 +00:00
Arc Wang
1e252c20eb
[automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 4b02b7dc7d
-s ours am: bb81ea5351
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219305
Change-Id: I67d90409411a2fe24889d247170004db69533f4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 00:43:42 +00:00
Arc Wang
ec921eea1a
[automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 640eab60f2
am: 3d9bdda678
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219307
Change-Id: Icdb07124a1e56fcde6643776e786a91095ac8d6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 00:42:03 +00:00
Arc Wang
3d9bdda678
[DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 640eab60f2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219307
Change-Id: Id9e9e4b50fc12780f71aad93666fbbf24f4d6429
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 00:24:04 +00:00
Arc Wang
5f01cd3e3f
[automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 1682354551
-s ours am: d47388ce79
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219306
Change-Id: I5548f6a891b5acd33af03ecfc1ca25d1c911d386
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 00:24:04 +00:00
Arc Wang
bb81ea5351
[automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 4b02b7dc7d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219305
Change-Id: I9340565fe25db91bb87566a028ea7238904138c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 00:23:55 +00:00
Arc Wang
d47388ce79
[automerger skipped] [DO NOT MERGE] Verify ringtone from ringtone picker is audio am: 1682354551
-s ours
...
am skip reason: Merged-In I0a9ca163f5ae91b67c9f957fde4c6db326b8718d with SHA-1 4b02b7dc7d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219306
Change-Id: Ib21fa93721b604e338d7a37add094e28e65ee4b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 00:23:46 +00:00
Arc Wang
d5cec0f5b9
Merge changes from topic "presubmit-am-1ef493659d7c45ffb8e88367e8e0f3d7" into sc-qpr1-dev
...
* changes:
[automerge] Verify ringtone from ringtone picker is audio 2p: f288d3a31b
Verify ringtone from ringtone picker is audio
2022-05-11 00:04:32 +00:00
Arc Wang
640eab60f2
[DO NOT MERGE] Verify ringtone from ringtone picker is audio
...
To improve privacy.
Bug: 221041256
Test: atest com.android.settings.DefaultRingtonePreferenceTest
Change-Id: I0a9ca163f5ae91b67c9f957fde4c6db326b8718d
Merged-In: I0a9ca163f5ae91b67c9f957fde4c6db326b8718d
(cherry picked from commit e4c22580c9
)
2022-05-10 01:43:16 +00:00
Arc Wang
4b02b7dc7d
[DO NOT MERGE] Verify ringtone from ringtone picker is audio
...
To improve privacy.
Bug: 221041256
Test: atest com.android.settings.DefaultRingtonePreferenceTest
Change-Id: I0a9ca163f5ae91b67c9f957fde4c6db326b8718d
Merged-In: I0a9ca163f5ae91b67c9f957fde4c6db326b8718d
(cherry picked from commit e4c22580c9
)
2022-05-10 01:42:41 +00:00
Arc Wang
1682354551
[DO NOT MERGE] Verify ringtone from ringtone picker is audio
...
To improve privacy.
Bug: 221041256
Test: atest com.android.settings.DefaultRingtonePreferenceTest
Change-Id: I0a9ca163f5ae91b67c9f957fde4c6db326b8718d
Merged-In: I0a9ca163f5ae91b67c9f957fde4c6db326b8718d
(cherry picked from commit e4c22580c9
)
2022-05-10 01:42:05 +00:00
Arc Wang
930822bc13
[automerge] Verify ringtone from ringtone picker is audio 2p: f288d3a31b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18219304
Bug: 221041256
Change-Id: I8970b251440e9f3f86b715ca225c545463a56164
Merged-In: I0a9ca163f5ae91b67c9f957fde4c6db326b8718d
2022-05-09 02:07:14 +00:00
Arc Wang
f288d3a31b
Verify ringtone from ringtone picker is audio
...
To improve privacy.
Bug: 221041256
Test: atest com.android.settings.DefaultRingtonePreferenceTest
Change-Id: I0a9ca163f5ae91b67c9f957fde4c6db326b8718d
Merged-In: I0a9ca163f5ae91b67c9f957fde4c6db326b8718d
(cherry picked from commit e4c22580c9
)
2022-05-09 02:07:00 +00:00
Arc Wang
babe83e217
Verify ringtone from ringtone picker is audio
...
To improve privacy.
Bug: 221041256
Test: atest com.android.settings.DefaultRingtonePreferenceTest
Change-Id: I0a9ca163f5ae91b67c9f957fde4c6db326b8718d
Merged-In: I0a9ca163f5ae91b67c9f957fde4c6db326b8718d
(cherry picked from commit e4c22580c9
)
2022-05-09 02:06:08 +00:00
Jack Yu
2290b0af8c
Do not let guest user disable secuer nfc via SettingsSlice
...
Do not let guest user switch the secure nfc preferernce setting.
Bug: 228314987
Test: manual
Change-Id: I60a832e32d83bb57d968af2f8b92d94e2ac7c6a2
2022-05-04 18:06:04 +08:00
Bill Yi
551016f43b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 392df50da0
-s ours am: 5e07d7fd84
-s ours am: d75e8abee9
-s ours am: 1836db16f7
-s ours am: a8f28ed7c5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18054880
Change-Id: I5cea3e375757e71dc4f940d0e02aaa6425cc8136
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-02 23:29:26 +00:00
Bill Yi
a8f28ed7c5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 392df50da0
-s ours am: 5e07d7fd84
-s ours am: d75e8abee9
-s ours am: 1836db16f7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18054880
Change-Id: Ib411051ca0e3f2d2b849688bce481a663a44fadb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-02 22:53:37 +00:00
Bill Yi
1836db16f7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 392df50da0
-s ours am: 5e07d7fd84
-s ours am: d75e8abee9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18054880
Change-Id: I99d69b8e647e305a479b153fc02214669d1a2afa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-02 22:29:38 +00:00
Bill Yi
0b07e79cc1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac6b0bdef6
-s ours am: 223d9c81f2
-s ours am: a509cd4695
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18054676
Change-Id: Id91cf446e28fb0ced0561e2be10ced8c69ab6427
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-02 22:06:03 +00:00
Bill Yi
7a2a5bd916
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42c15dc26c
-s ours am: f46213941c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062872
Change-Id: I3933eb376b11ac6d0944db6ada4c75b52ff87674
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-02 22:05:58 +00:00
Bill Yi
d75e8abee9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 392df50da0
-s ours am: 5e07d7fd84
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18054880
Change-Id: I4c0e9c3e7134386a49cfaa8271c9a109f2c55d03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-02 22:04:25 +00:00
Bill Yi
5e07d7fd84
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 392df50da0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18054880
Change-Id: I048fe580663c03d27cae41e605f9d6719507e0c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-02 21:28:28 +00:00
Bill Yi
a509cd4695
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac6b0bdef6
-s ours am: 223d9c81f2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18054676
Change-Id: I014dc4924b12540a4eb6c97d93fd0b4d67155879
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-02 21:26:44 +00:00
Bill Yi
f46213941c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42c15dc26c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062872
Change-Id: Idccc655c084ed720a595d4a8946738fa9eecb39b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-02 21:26:27 +00:00
Bill Yi
223d9c81f2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac6b0bdef6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18054676
Change-Id: Iee353b944bfcf19af8b5333daa0dfcfcbaa85cd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-02 21:26:16 +00:00
TreeHugger Robot
0a2b1de3a5
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2022-04-28 22:57:53 +00:00
Bill Yi
bf87406634
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aedbfeb8b8
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18062875
Bug: 205460459
Change-Id: Ia2ea434fb2d27315227d57f23eb63bae7ecb821a
2022-04-28 18:51:57 +00:00
Bill Yi
b81da264a8
Import translations. DO NOT MERGE ANYWHERE
...
BUG:205460459
Auto-generated-cl: translation import
Change-Id: I93c43875f9bc7b4cb45bb663c70410fa3fcaeead
2022-04-28 18:48:59 +00:00
Bill Yi
aedbfeb8b8
Import translations. DO NOT MERGE ANYWHERE
...
BUG:205460459
Auto-generated-cl: translation import
Change-Id: I5bb2a5d970bbdff0ea715cef8f0fca7bd052a670
2022-04-28 18:46:21 +00:00
Bill Yi
42c15dc26c
Import translations. DO NOT MERGE ANYWHERE
...
BUG:205460459
Auto-generated-cl: translation import
Change-Id: Ie80b96d07d3e8bd2c55b86e0af83bdb6a418b3fc
2022-04-28 18:43:59 +00:00
Bill Yi
ac6b0bdef6
Import translations. DO NOT MERGE ANYWHERE
...
BUG:205460459
Auto-generated-cl: translation import
Change-Id: I669099ad00ba7d90013836e3d456d530ae725b2f
2022-04-28 18:39:25 +00:00
Bill Yi
392df50da0
Import translations. DO NOT MERGE ANYWHERE
...
BUG:205460459
Auto-generated-cl: translation import
Change-Id: I67386b7749b6575747c0507e3841fa404c6a69f4
2022-04-28 18:23:10 +00:00
Edgar Wang
a3e7bb87d0
Fix LaunchAnyWhere in AppRestrictionsFragment am: b3eecdd13d
am: 9562e2e011
am: 7541d3495f
am: 9a206c5870
am: cc1c6ea62e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730674
Change-Id: I1999c2815380ff902d79e46131f43ece95efad2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 04:40:33 +00:00
Edgar Wang
cc1c6ea62e
Fix LaunchAnyWhere in AppRestrictionsFragment am: b3eecdd13d
am: 9562e2e011
am: 7541d3495f
am: 9a206c5870
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730674
Change-Id: I878c7c8a4cbccd1660bc4ed7d18d9483fb49c492
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 04:15:56 +00:00
Edgar Wang
9a206c5870
Fix LaunchAnyWhere in AppRestrictionsFragment am: b3eecdd13d
am: 9562e2e011
am: 7541d3495f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730674
Change-Id: Ie6d6192a880c6f6fa26a4374be7c6281ef70ada9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 03:22:14 +00:00
Edgar Wang
7541d3495f
Fix LaunchAnyWhere in AppRestrictionsFragment am: b3eecdd13d
am: 9562e2e011
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730674
Change-Id: I20b4dbcd149a796e0c56657403d30d6f31d3274c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 03:01:15 +00:00
Edgar Wang
2263cbafcb
Fix LaunchAnyWhere in AppRestrictionsFragment am: aeb36e5c28
am: 03d36d79d6
am: 036905c62a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730675
Change-Id: I968e9a703cd02f07fe017b4c891e961ceb2634ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 02:49:06 +00:00
Edgar Wang
38ad8f1cdd
Fix LaunchAnyWhere in AppRestrictionsFragment am: 1b9da55a31
am: 0b17e62b6b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730676
Change-Id: Ifb5fea395bee6d0951689f377ea70a7405ef872f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 02:49:00 +00:00
Edgar Wang
280cf1e018
Fix LaunchAnyWhere in AppRestrictionsFragment am: f8f45888e6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730677
Change-Id: I7f47d79589f9d8c66284fd9a496c0ed64de2f45b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 02:48:55 +00:00
Edgar Wang
036905c62a
Fix LaunchAnyWhere in AppRestrictionsFragment am: aeb36e5c28
am: 03d36d79d6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730675
Change-Id: Iba3eba75524c0e6b64a7c69e38733e844b08e086
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 02:47:56 +00:00
Edgar Wang
0b17e62b6b
Fix LaunchAnyWhere in AppRestrictionsFragment am: 1b9da55a31
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730676
Change-Id: Ia021a8974fa666e1aa2b5f87418bd1096473f2eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 02:47:49 +00:00
Edgar Wang
9562e2e011
Fix LaunchAnyWhere in AppRestrictionsFragment am: b3eecdd13d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730674
Change-Id: Ib3c3ca64de6e099b2e2fde18abd35feb3412878c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 02:47:48 +00:00
Edgar Wang
03d36d79d6
Fix LaunchAnyWhere in AppRestrictionsFragment am: aeb36e5c28
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730675
Change-Id: Ice72452717b8ca2edd68a01ba103b33cc7b12fea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 02:47:40 +00:00
Edgar Wang
f600c05a5a
Fix LaunchAnyWhere in AppRestrictionsFragment
...
If the intent's package equals to the app's package, this intent
will be allowed to startActivityForResult.
But this check is unsafe, because if the component of this intent
is set, the package field will just be ignored. So if we set the
component to any activity we like and set package to the app's
package, it will pass the assertSafeToStartCustomActivity check
and now we can launch anywhere.
Bug: 223578534
Test: robotest and manual verify
Change-Id: I40496105bae313fe5cff2a36dfe329c1e2b5bbe4
(cherry picked from commit 90e095dbe3
)
2022-04-13 04:50:33 +00:00