TreeHugger Robot
80404721aa
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-01-05 20:13:42 +00:00
Grace Cheng
28d0e72a6d
Merge "Updates sfps animations for natural orientation" into tm-qpr-dev
2023-01-05 19:57:19 +00:00
Karen Lu
d6a9cba834
Merge "Revert "Use Mockito 4.6.1 API"" into tm-qpr-dev
2023-01-05 05:22:28 +00:00
Karen Lu
869fd2f33e
Revert "Use Mockito 4.6.1 API"
...
Revert submission 20749672-cherrypick-robo-mockito-4.6.1-4rg619yrrf
Reason for revert: Breaking the build on tm-qpr-dev. Bug tracked here: b/264473028
Reverted changes: /q/submissionid:20749672-cherrypick-robo-mockito-4.6.1-4rg619yrrf
Change-Id: Ie9d9d944093752f44eff67627e4a35f4df47e6de
2023-01-05 05:15:10 +00:00
Matt Pietal
c617ae851d
Update wallet setting availability
...
For devices that don't support wallet, don't even show the setting in
a disabled state, which can cause confusion and lead the user to
believe they can enable it somehow.
Fixes: 251089510
Test: WalletPrivacyPreferenceControllerTest
Change-Id: I5d60957f24712bb4d75e72fa5f64cab35b6d6a5f
2023-01-04 21:39:43 +00:00
Grace Cheng
a301ba8a68
Merge "Adding product string variants on choose lock page" into tm-qpr-dev
2023-01-04 20:30:37 +00:00
Yanting Yang
86914bedc8
Add DISALLOW_APPS_CONTROL check into uninstall app for all users
...
Settings App info page supports a "Uninstall for all users" function
when multiple users are enabled. It bypasses the restriction of
DISALLOW_APPS_CONTROL which breaks the user isolation guideline.
To fix this vulnerability, we should check the DISALLOW_APPS_CONTROL
restriction to provide the "Uninstall for all users" function.
Bug: 258653813
Test: manual & robotests
Change-Id: I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6
Merged-In: I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6
2023-01-04 18:59:18 +00:00
Yanting Yang
1a43a98334
Add DISALLOW_APPS_CONTROL check into uninstall app for all users
...
Settings App info page supports a "Uninstall for all users" function
when multiple users are enabled. It bypasses the restriction of
DISALLOW_APPS_CONTROL which breaks the user isolation guideline.
To fix this vulnerability, we should check the DISALLOW_APPS_CONTROL
restriction to provide the "Uninstall for all users" function.
Bug: 258653813
Test: manual & robotests
Change-Id: I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6
Merged-In: I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6
2023-01-04 18:58:32 +00:00
Yanting Yang
16500a7ada
Add DISALLOW_APPS_CONTROL check into uninstall app for all users
...
Settings App info page supports a "Uninstall for all users" function
when multiple users are enabled. It bypasses the restriction of
DISALLOW_APPS_CONTROL which breaks the user isolation guideline.
To fix this vulnerability, we should check the DISALLOW_APPS_CONTROL
restriction to provide the "Uninstall for all users" function.
Bug: 258653813
Test: manual & robotests
Change-Id: I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6
Merged-In: I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6
2023-01-04 18:56:58 +00:00
Yanting Yang
0616b484e9
Add DISALLOW_APPS_CONTROL check into uninstall app for all users
...
Settings App info page supports a "Uninstall for all users" function
when multiple users are enabled. It bypasses the restriction of
DISALLOW_APPS_CONTROL which breaks the user isolation guideline.
To fix this vulnerability, we should check the DISALLOW_APPS_CONTROL
restriction to provide the "Uninstall for all users" function.
Bug: 258653813
Test: manual & robotests
Change-Id: I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6
Merged-In: I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6
2023-01-04 18:56:09 +00:00
Bill Yi
38268df283
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie79ca403bec54dde34679db06de8813e5aaedc77
2023-01-04 09:36:13 -08:00
Bill Yi
6480a5ff9c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia1c2df934afa7f83fb9990b59be46adaf88c2329
2023-01-04 09:29:44 -08:00
Yanting Yang
9191ec13e2
Add DISALLOW_APPS_CONTROL check into uninstall app for all users
...
Settings App info page supports a "Uninstall for all users" function
when multiple users are enabled. It bypasses the restriction of
DISALLOW_APPS_CONTROL which breaks the user isolation guideline.
To fix this vulnerability, we should check the DISALLOW_APPS_CONTROL
restriction to provide the "Uninstall for all users" function.
Bug: 258653813
Test: manual & robotests
Change-Id: I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6
Merged-In: I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6
2023-01-04 16:21:24 +00:00
Yanting Yang
22e4eebafe
Add DISALLOW_APPS_CONTROL check into uninstall app for all users
...
Settings App info page supports a "Uninstall for all users" function
when multiple users are enabled. It bypasses the restriction of
DISALLOW_APPS_CONTROL which breaks the user isolation guideline.
To fix this vulnerability, we should check the DISALLOW_APPS_CONTROL
restriction to provide the "Uninstall for all users" function.
Bug: 258653813
Test: manual & robotests
Change-Id: I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6
Merged-In: I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6
2023-01-04 16:16:34 +00:00
Yanting Yang
f3b323e378
Add DISALLOW_APPS_CONTROL check into uninstall app for all users
...
Settings App info page supports a "Uninstall for all users" function
when multiple users are enabled. It bypasses the restriction of
DISALLOW_APPS_CONTROL which breaks the user isolation guideline.
To fix this vulnerability, we should check the DISALLOW_APPS_CONTROL
restriction to provide the "Uninstall for all users" function.
Bug: 258653813
Test: manual & robotests
Change-Id: I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6
Merged-In: I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6
2023-01-04 16:15:16 +00:00
Kevin Liu
cb8c1c6c85
Merge "Use Mockito 4.6.1 API" into tm-qpr-dev
2023-01-04 14:50:04 +00:00
Tsung-Mao Fang
50c13af93d
[automerger skipped] [DO NOT MERGE] FRP bypass defense in the settings app am: ff5bfb40c8
-s ours am: 4332b3266e
-s ours am: ac092ac06f
-s ours am: a5904fed59
-s ours am: 322e0d684d
-s ours am: 6800574d8d
-s ours am: e531e8e79f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20641138
Change-Id: If4f5fc112b2faa52d3f646f4deddeb327e14eb2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-04 05:01:02 +00:00
Tsung-Mao Fang
ff41a2c13e
[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: 8ab6eb1be3
-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: I6e8d8f12d951a570b48dd8081df775be419e9378
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-04 05:00:54 +00:00
Tsung-Mao Fang
e531e8e79f
[automerger skipped] [DO NOT MERGE] FRP bypass defense in the settings app am: ff5bfb40c8
-s ours am: 4332b3266e
-s ours am: ac092ac06f
-s ours am: a5904fed59
-s ours am: 322e0d684d
-s ours am: 6800574d8d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20641138
Change-Id: I65a05b9b91bd9960353cd665ff7d511c8e5f7db4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-04 04:30:51 +00:00
Tsung-Mao Fang
8ab6eb1be3
[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: Idfdb6511df114a8f1677a61adf4214d80dff13ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-04 04:30:41 +00:00
Tsung-Mao Fang
6800574d8d
[automerger skipped] [DO NOT MERGE] FRP bypass defense in the settings app am: ff5bfb40c8
-s ours am: 4332b3266e
-s ours am: ac092ac06f
-s ours am: a5904fed59
-s ours am: 322e0d684d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20641138
Change-Id: Idaa448d3fe509febe2c183d3919de06723432a50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-04 03:56:33 +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
Arc Wang
1e2d9162c2
[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: 9ab2f7b65b
-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: I31a8f427b45eee135a7e498cee57fc009a6ba70a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-04 03:27:56 +00:00
Tsung-Mao Fang
84a63ef6ce
[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: f70458cdd9
-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: I1d28a0c139c336ae6dec56734d54144ce1c1e1df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-04 03:27:54 +00:00
Tsung-Mao Fang
5623c07822
[automerger skipped] FRP bypass defense in the settings app am: 22869d9019
-s ours am: 9764e1f9fd
-s ours am: 0f05806ab5
-s ours am: 5fd32e90b6
-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: I048ba0a93f603192e3bb0864ff3ac045a45b00db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-04 03:27:45 +00:00
Tsung-Mao Fang
322e0d684d
[automerger skipped] [DO NOT MERGE] FRP bypass defense in the settings app am: ff5bfb40c8
-s ours am: 4332b3266e
-s ours am: ac092ac06f
-s ours am: a5904fed59
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20641138
Change-Id: Ia726a7ef8c5b01d38600a55156195e9e717afb99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-04 03:27:43 +00:00
Arc Wang
999bc0b0d0
[automerger skipped] Merge "FRP bypass defense in the settings app" into sc-v2-dev am: 9a6c84c47e
-s ours am: eeafd49d4e
-s ours am: ecf1846617
-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: I510fb01461bb9f9c3e3512e8a2453c3e2ada6a30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-04 03:27:37 +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
Tsung-Mao Fang
4423f3e0b6
[automerger skipped] FRP bypass defense in the settings app am: 1cf31d17aa
-s ours am: b8fd889067
-s ours am: 38ee0a345a
-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: Id5bb6d930eb0c0c8fdeef3b9dfa9bb1a0399018f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-04 03:27:35 +00:00
Arc Wang
9ab2f7b65b
[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: Ie4a72b916f5ccaeafa234150f6619c2666e03719
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-04 02:55:34 +00:00
Tsung-Mao Fang
f70458cdd9
[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: I9497386a645e3fe4817da89ce597a6dad00dc7d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-04 02:55:33 +00:00
Tsung-Mao Fang
5fd32e90b6
[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: Iba760e28f5d6dde8384873f171544772a5af2318
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-04 02:55:26 +00:00
Arc Wang
ecf1846617
[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: Ic02f075561163bbe76ec94cea2640e1bbdee5915
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-04 02:55:19 +00:00
Tsung-Mao Fang
38ee0a345a
[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: Id0a41a267ae5106ed4fc236500c92a949f1f7f99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-04 02:55:18 +00:00
Tsung-Mao Fang
a5904fed59
[automerger skipped] [DO NOT MERGE] FRP bypass defense in the settings app am: ff5bfb40c8
-s ours am: 4332b3266e
-s ours am: ac092ac06f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20641138
Change-Id: I457040da17e352a4d1cee1453e11daeffb1f5eec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-04 02:52:16 +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
Tsung-Mao Fang
ac092ac06f
[automerger skipped] [DO NOT MERGE] FRP bypass defense in the settings app am: ff5bfb40c8
-s ours am: 4332b3266e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20641138
Change-Id: Ie83ac1cc02b260d9468438076e8ca8ff11e72a68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-04 02:17:51 +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
Tsung-Mao Fang
4332b3266e
[automerger skipped] [DO NOT MERGE] FRP bypass defense in the settings app am: ff5bfb40c8
-s ours
...
am skip reason: Merged-In Ia18f367109df5af7da0a5acad7702898a459d32e with SHA-1 b34ff2f272
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20641138
Change-Id: Ia867eecc252f5bc5e95e2fd49e2802e9f1d413dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-04 02:17:27 +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
Grace Cheng
8ada95641a
Updates sfps animations for natural orientation
...
Updates enroll find sensor animations given sfps natural orientation switch from landscape to portrait
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FingerprintEnrollFindSensorTest
Fixes: 264274708
Change-Id: I392767d2bde98e3509eef29f3095b2dafee16a30
2023-01-04 00:00:45 +00:00