Kevin Liu
|
cb8c1c6c85
|
Merge "Use Mockito 4.6.1 API" into tm-qpr-dev
|
2023-01-04 14:50:04 +00:00 |
|
Treehugger Robot
|
2fa3b95342
|
Merge "Fix comment typo in BluetoothLengthDeviceNameFilter" am: 02888676a7 am: aa723a43dd
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2375748
Change-Id: I7248e9b4f45a82ecaf55a451817dc5e056ba6c4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-01-04 11:53:04 +00:00 |
|
Treehugger Robot
|
aa723a43dd
|
Merge "Fix comment typo in BluetoothLengthDeviceNameFilter" am: 02888676a7
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2375748
Change-Id: Ic14cfd40900d12b1349a1e6905e1a92351c168e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-01-04 11:37:59 +00:00 |
|
Treehugger Robot
|
02888676a7
|
Merge "Fix comment typo in BluetoothLengthDeviceNameFilter"
|
2023-01-04 11:05:58 +00:00 |
|
Shen Lin
|
85067c8136
|
Fix comment typo in BluetoothLengthDeviceNameFilter
Change-Id: I222d048e683bff4473849d26de50318b51a1eb9e
Test: manual
|
2023-01-04 08:46:12 +00:00 |
|
Tsung-Mao Fang
|
e2532f29c1
|
[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: 50c13af93d -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: Idfdac838b857f7bd159d303c0e5b7a6c637f6a5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-01-04 05:43:01 +00:00 |
|
Tsung-Mao Fang
|
9c43d60fd1
|
[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: ff41a2c13e -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: I7ce2758a3e0cf093feaa5ca90f0c474b6a1b0b02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-01-04 05:42:41 +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 |
|
Arc Wang
|
4fd3532821
|
[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: 1e2d9162c2 -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: I1c0fb2d69e1a93dc66819c48187c3556a390693c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-01-04 03:56:49 +00:00 |
|
Tsung-Mao Fang
|
be972c495d
|
[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: 84a63ef6ce -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: I1ae9b4782c717b6d66b30e79b00f1e17f8b1d0a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-01-04 03:56:46 +00:00 |
|
Tsung-Mao Fang
|
32fb9f64c1
|
[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: 5623c07822 -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: Ia8e48a28430f949d09ce6a4afd5d8f0b9f2fff54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-01-04 03:56:36 +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 |
|
Arc Wang
|
f035fc4554
|
[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: 999bc0b0d0 -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: I204c1a02bacac6ad5dabd119cdf12530605961a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-01-04 03:56:27 +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
|
d136453d40
|
[automerger skipped] FRP bypass defense in the settings app am: 1cf31d17aa -s ours am: b8fd889067 -s ours am: 38ee0a345a -s ours am: 4423f3e0b6 -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: Iebcb8742893845d8a8ab007f2ed688b697bc19a8
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 |
|
Android Build Coastguard Worker
|
3c9a28eff1
|
Snap for 9451646 from 85379e9452 to tm-qpr2-release
Change-Id: Ic8a6a903323e96da462ee915b79395ffd5885ef7
|
2023-01-04 00:25:49 +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 |
|
Yasin Kilicdere
|
541a984ce0
|
Merge "Remove the fallback AddSupervisedUserActivity." into tm-dev am: 15a89a60ac am: 2ecf96a422 am: 85379e9452
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20665167
Change-Id: I64b7be5d06cc021d992ed2ca1d84305669234fca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-01-03 23:03:32 +00:00 |
|
TreeHugger Robot
|
a1903f88aa
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 20d80e79da -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20846098
Change-Id: I53d89a62410dfdd0601771857cde28fdbfab92ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-01-03 22:08:01 +00:00 |
|
Bill Yi
|
1dbf29aa1d
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5baeaab354 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20846098
Change-Id: Ic0cee3b35f9e58f571a1cbf368dbbf80e7b11baf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-01-03 22:07:58 +00:00 |
|