TreeHugger Robot
a823a034fa
[automerger skipped] Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into tm-dev am: 7429f710f7
-s ours am: 4f3cd58c02
-s ours am: 240745ee63
-s ours
...
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 d5771108b9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Change-Id: I6a6e4c1ca0e34c58be6a7cb397364de5c387b579
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 23:54:41 +00:00
Milton Wu
f1e7e8ff81
[automerger skipped] [automerged blank] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb
2p: 353e941920
am: 9e76d2c1fb
-s ours am: 14584ec665
-s ours am: d9cc9813c3
-s ours
...
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 d5771108b9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Change-Id: Ia0d1ce6d2180c737f9190b98040db8c4b592f3b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 23:54:36 +00:00
TreeHugger Robot
240745ee63
[automerger skipped] Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into tm-dev am: 7429f710f7
-s ours am: 4f3cd58c02
-s ours
...
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 d5771108b9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Change-Id: I66012bf2ae40ebe67bb874663b5123867e80700a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 23:27:38 +00:00
Milton Wu
d9cc9813c3
[automerger skipped] [automerged blank] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb
2p: 353e941920
am: 9e76d2c1fb
-s ours am: 14584ec665
-s ours
...
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 d5771108b9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Change-Id: I7aa21e8994679c4a90fbc590f2caa080983cb7d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 23:27:37 +00:00
TreeHugger Robot
4f3cd58c02
[automerger skipped] Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into tm-dev am: 7429f710f7
-s ours
...
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 d5771108b9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Change-Id: I158405e4b86b56d57116e838b6454984f2cdf13f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 22:59:25 +00:00
Milton Wu
14584ec665
[automerger skipped] [automerged blank] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb
2p: 353e941920
am: 9e76d2c1fb
-s ours
...
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 d5771108b9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Change-Id: I8c364167356ffcd830c14644f0bbd39da6730bdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 22:59:24 +00:00
TreeHugger Robot
7429f710f7
Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into tm-dev
...
* changes:
[automerged blank] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb
2p: 353e941920
[automerge] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb
[DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern
2022-09-28 22:37:17 +00:00
SongFerng Wang
d57eb2054b
Merge "Add the way for hiding the "contact sharing" on the pairing dialog" into tm-qpr-dev am: f970d63b3b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20033811
Change-Id: Ic22f2dd71f84556397bf44344812aa5fe156c024
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 20:09:16 +00:00
SongFerng Wang
f970d63b3b
Merge "Add the way for hiding the "contact sharing" on the pairing dialog" into tm-qpr-dev
2022-09-28 19:45:33 +00:00
TreeHugger Robot
e7e1f37321
Merge "Restrict Wi-Fi configuration if settings UI is restricted" into tm-qpr-dev am: ee21072a5e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20063305
Change-Id: I3e4661df4a20415b44390eb6484811e3073e9f58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 17:32:08 +00:00
TreeHugger Robot
ee21072a5e
Merge "Restrict Wi-Fi configuration if settings UI is restricted" into tm-qpr-dev
2022-09-28 16:48:10 +00:00
Milton Wu
215229d8b6
[automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: d5771108b9
-s ours am: 5561341091
-s ours am: 8da95c29a9
-s ours am: 98b4b76031
-s ours am: 21bdc69fca
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961564
Change-Id: I02f0cd9e71ff15eb42018ece20fa3f7dec0013f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 05:21:03 +00:00
Milton Wu
21bdc69fca
[automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: d5771108b9
-s ours am: 5561341091
-s ours am: 8da95c29a9
-s ours am: 98b4b76031
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961564
Change-Id: I31993a5df066f89b49d58f87ccec93140a1a8f6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 04:54:25 +00:00
Milton Wu
9b0fef7518
[automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: d5771108b9
-s ours am: 5561341091
-s ours am: 8da95c29a9
-s ours am: 659c5c18bf
-s ours am: 2082b28cd4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961564
Change-Id: I606f1f28d4f7d8dd3cf1988217078184faad955f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 04:51:56 +00:00
Milton Wu
131913f877
[automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: 27bddff2ac
-s ours am: ed094b353b
-s ours am: c5b9a0a392
-s ours am: 7bc9d083a3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961565
Change-Id: Iba92c4cf49d8864ea9a14b65763aab7205ac9dde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 04:51:49 +00:00
TreeHugger Robot
ae4b8500f1
[automerger skipped] Merge "[DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern" into tm-dev am: eaabdee25c
am: 69c61a3a8e
-s ours am: 600dcaa313
-s ours
...
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 98239c0da6
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961566
Change-Id: I4f2e4c8f529ca81e8fefc78bad4dc83e1146c43d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 04:51:41 +00:00
Milton Wu
8611757c28
[automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: aac79b894f
am: 1ec2b21d42
-s ours am: a78ad20f4c
-s ours
...
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 98239c0da6
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961566
Change-Id: Icde1caac4f0b2c7b7d42adc3b966b2cb0c9f6604
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 04:51:35 +00:00
Milton Wu
5cfcf9c636
[automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: d5771108b9
-s ours am: 5561341091
-s ours am: 8da95c29a9
-s ours am: 659c5c18bf
-s ours am: f3908f86a8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961564
Change-Id: I0a29d6645275aae43e813e5a4a2d6227c7cb45bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 04:27:57 +00:00
Milton Wu
9ddbe82975
[automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: 27bddff2ac
-s ours am: ed094b353b
-s ours am: c5b9a0a392
-s ours am: 7f3518b972
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961565
Change-Id: Iac7738dde5c547608c3e09bfdce680067e2fcef5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 04:27:51 +00:00
TreeHugger Robot
e1f877e7a6
[automerger skipped] Merge "[DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern" into tm-dev am: eaabdee25c
am: 69c61a3a8e
-s ours am: b088e86798
-s ours
...
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 27bddff2ac
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961566
Change-Id: Ic190bad75a5ce5ab5d168cb5c091089d4e9f02c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 04:27:43 +00:00
Milton Wu
41de61129a
[automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: aac79b894f
am: 1ec2b21d42
-s ours am: ac8ca06ff1
-s ours
...
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 27bddff2ac
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961566
Change-Id: I9b9a607ba10c8f692a44fac85ca5f02b8d1e34df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 04:27:42 +00:00
Milton Wu
e44c4955d6
[automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: 27bddff2ac
-s ours am: ed094b353b
-s ours am: 0c46b7840d
-s ours am: 8ab8fe61f4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961565
Change-Id: I67936134f4d2e39e93cf00d88d7b902c87910724
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 04:27:35 +00:00
TreeHugger Robot
d584c0c654
[automerger skipped] Merge "[DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern" into tm-dev am: eaabdee25c
am: d6b7661b56
am: 6e55e052b5
-s ours
...
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 98239c0da6
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961566
Change-Id: I512f02dcf8625f0072446b388f5513a5056d3251
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 04:27:01 +00:00
Milton Wu
f0bc03a3fa
[automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: aac79b894f
am: 23e9e62a23
am: 9c3b6ef6fc
-s ours
...
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 98239c0da6
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961566
Change-Id: I0496802d315009d717baaf399b4870577112292e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 04:27:00 +00:00
Arc Wang
7b7c62d78a
Merge "Fix USB OTG hot plug out nndexOutOfBoundsException" am: 6626e50dd8
am: 99cb9d91f1
am: 9f04b02571
am: 9a2052945a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2222981
Change-Id: I69f24f5a63070e84af70bd050dca789ef34b16ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 04:26:01 +00:00
Milton Wu
f3908f86a8
[automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: d5771108b9
-s ours am: 5561341091
-s ours am: 8da95c29a9
-s ours am: 659c5c18bf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961564
Change-Id: I8ca200ad5413e5550c60504e0ed0835e33d5492a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 04:25:22 +00:00
Milton Wu
2082b28cd4
[automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: d5771108b9
-s ours am: 5561341091
-s ours am: 8da95c29a9
-s ours am: 659c5c18bf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961564
Change-Id: I746772c895d786ec4b6ae734df29598651053ae4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 04:25:18 +00:00
Milton Wu
7f3518b972
[automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: 27bddff2ac
-s ours am: ed094b353b
-s ours am: c5b9a0a392
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961565
Change-Id: Ic3909f2bc205da26a136901d4d9717c3387731fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 04:25:16 +00:00
Milton Wu
7bc9d083a3
[automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: 27bddff2ac
-s ours am: ed094b353b
-s ours am: c5b9a0a392
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961565
Change-Id: I56a72123e55bb8a51286b1980d114d3f6df4e08c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 04:25:13 +00:00
TreeHugger Robot
600dcaa313
[automerger skipped] Merge "[DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern" into tm-dev am: eaabdee25c
am: 69c61a3a8e
-s ours
...
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 98239c0da6
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961566
Change-Id: Ib62140422f60dc4d3a7b5974191c1016a06e7755
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 04:25:01 +00:00
Milton Wu
a78ad20f4c
[automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: aac79b894f
am: 1ec2b21d42
-s ours
...
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 98239c0da6
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961566
Change-Id: I779f0ddfb01d49e952276c5df80885ea7a6f6414
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 04:25:00 +00:00
TreeHugger Robot
b088e86798
[automerger skipped] Merge "[DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern" into tm-dev am: eaabdee25c
am: 69c61a3a8e
-s ours
...
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 27bddff2ac
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961566
Change-Id: I8348b747bc561f5048140d824c6d7f449e01a584
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 04:25:00 +00:00
Milton Wu
ac8ca06ff1
[automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: aac79b894f
am: 1ec2b21d42
-s ours
...
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 27bddff2ac
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961566
Change-Id: I09664ff91c81e1ebb7379c81913179ee9f21a045
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 04:24:58 +00:00
Milton Wu
659c5c18bf
[automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: d5771108b9
-s ours am: 5561341091
-s ours am: 8da95c29a9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961564
Change-Id: Id253290f643928b0f923d08dfe28d5d4f4ce8127
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 04:24:49 +00:00
Milton Wu
98b4b76031
[automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: d5771108b9
-s ours am: 5561341091
-s ours am: 8da95c29a9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961564
Change-Id: I6479bd21413acdd463881ddea502d84217f85da3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 04:22:04 +00:00
Milton Wu
8da95c29a9
[automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: d5771108b9
-s ours am: 5561341091
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961564
Change-Id: If075061207ed359f26ec3a597792329d77bc537a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 03:53:17 +00:00
Milton Wu
8ab8fe61f4
[automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: 27bddff2ac
-s ours am: ed094b353b
-s ours am: 0c46b7840d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961565
Change-Id: Iabfec6f5b7e8e8e081eccc300ba96dac786f12e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 03:45:42 +00:00
TreeHugger Robot
6e55e052b5
Merge "[DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern" into tm-dev am: eaabdee25c
am: d6b7661b56
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961566
Change-Id: I8dbaa4e3b4b99684018d319c24abae36130e6f6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 03:45:34 +00:00
Milton Wu
9c3b6ef6fc
[DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: aac79b894f
am: 23e9e62a23
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961566
Change-Id: I845d15a1cca778eb3becaeb7cb8eae80da9b246d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 03:45:33 +00:00
Arc Wang
9a2052945a
Merge "Fix USB OTG hot plug out nndexOutOfBoundsException" am: 6626e50dd8
am: 99cb9d91f1
am: 9f04b02571
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2222981
Change-Id: I03210d69ecb91b8f98a8182a2954d8d9799d023a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 03:45:00 +00:00
Milton Wu
c5b9a0a392
[automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: 27bddff2ac
-s ours am: ed094b353b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961565
Change-Id: I73af48e2970b25de9cc00f6326123aea504b3c3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 03:43:40 +00:00
TreeHugger Robot
69c61a3a8e
Merge "[DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern" into tm-dev am: eaabdee25c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961566
Change-Id: I0dbeb8395a1be08c1c0c894c4b9300a735c6050a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 03:43:33 +00:00
Milton Wu
1ec2b21d42
[DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: aac79b894f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961566
Change-Id: I2a898ea074fa01c6ffd8742e9d41762bed20fab4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 03:43:32 +00:00
Milton Wu
5561341091
[automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: d5771108b9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961564
Change-Id: Icfaa44c53c3f78950a453879f34d27ff8aa88bc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 03:42:15 +00:00
Milton Wu
0c46b7840d
[automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: 27bddff2ac
-s ours am: ed094b353b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961565
Change-Id: I44fd4f0b1790fd8a794fd64715e1deb424cf957b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 03:40:33 +00:00
TreeHugger Robot
d6b7661b56
Merge "[DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern" into tm-dev am: eaabdee25c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961566
Change-Id: Ide91525eb2f13fa28d9d2f84c8748855ec34ad9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 03:40:15 +00:00
Milton Wu
23e9e62a23
[DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: aac79b894f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961566
Change-Id: Ie15c1ba2581ec94323d365e55e623e355fc26069
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 03:40:12 +00:00
Milton Wu
ed094b353b
[automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: 27bddff2ac
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961565
Change-Id: I911ef7db2860485823aa86c8c79e037b3db45389
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 03:39:23 +00:00
TreeHugger Robot
eaabdee25c
Merge "[DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern" into tm-dev
2022-09-28 03:05:56 +00:00
Arc Wang
9f04b02571
Merge "Fix USB OTG hot plug out nndexOutOfBoundsException" am: 6626e50dd8
am: 99cb9d91f1
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2222981
Change-Id: Ib9b0b40a546d3eecb11535e28841a668e0fd3931
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 02:59:15 +00:00