PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
116,457 Commits 1 Branch 0 Tags
a758e74d9da680b4ab359bde5196f375f5d7088c
Commit Graph

116457 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Milton Wu
fcffcdd692 [automerger skipped] [automerge] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb am: 3f02770332 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403

Change-Id: I5d4a93f2029eb1ab012fb421874882a5ad699459
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 22:59:27 +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
526fe84452 [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: I088200b7e34a0075828ef2cb5251ef1be22839c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 22:58:28 +00:00
Milton Wu
68aeb6639b [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: I6c346ba06234fb12dd71d281432d97711d6c681c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 22:58:26 +00:00
TreeHugger Robot
3a28ab401b [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: Idc0a3eff48a1d461253d5609ada7a2f8f1489ccc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 22:56:43 +00:00
Milton Wu
6cfd8c6aa3 [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: I18f043a59751014380a81c8cdd25d71b9c6ff289
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 22:56:40 +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
TreeHugger Robot
80f5fd3836 Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into sc-qpr1-dev 
* changes:
  [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
1a53831df1 Merge "Add the way for hiding the "contact sharing" on the pairing dialog" into tm-qpr-dev am: f970d63b3b am: d57eb2054b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20033811

Change-Id: I9c0d24248c6e67d9c43139fa4668fbd4fc813c77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 20:46:23 +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
b7b554adb2 [automerger skipped] Merge "Restrict Wi-Fi configuration if settings UI is restricted" into tm-qpr-dev am: ee21072a5e am: e7e1f37321 -s ours 
am skip reason: Merged-In Id82498f41765f955e01bb311bb221d26f9574f31 with SHA-1 aaa65fc6f0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20063305

Change-Id: Ia9201564978b983fb1e96ecbfd21213fe564bcf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 18:01:57 +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
Xuanang Zhao
82f23fe8df Merge "Add auto rotation icon resource." 2022-09-28 15:09:55 +00:00
Chaohui Wang
b983d6b4bf Merge "Update Settings App for SpaEnvironment" 2022-09-28 12:14:48 +00:00
Xuanang Zhao
569932474e Add auto rotation icon resource. 
Change-Id: Ica60e4239439b01f1545bae6f1d809e29a4a9033
Bug: 248428429
Test: manual
 2022-09-28 17:55:01 +08:00
TreeHugger Robot
a27418931c Merge "Fix AppInteractAcrossProfilesSettingsActivity crashed problem" 2022-09-28 09:32:06 +00:00
Chaohui Wang
ff5d430acc Update Settings App for SpaEnvironment 
Bug: 249028339
Test: Manual with Settings App
Change-Id: I4b174d250f20e827a383508beb3c9709128863ba
 2022-09-28 15:25:43 +08:00
Milton Wu
0004b7264d [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: 215229d8b6 -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: I356c9ff1ebfa92ac2f7042835723fe50a3d1a19c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 05:49:50 +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
36864ba1fd [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: 9b0fef7518 -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: I38b2841b20a60c0b472766bf333f488a1a073275
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 04:57:11 +00:00
Milton Wu
a7dec9ebf2 [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: 131913f877 -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: I30b1b4ea5f67d62c885eb7fc2124d4b7bf8b0f43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 04:57:02 +00:00
TreeHugger Robot
075cd177b4 [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: ae4b8500f1 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961566

Change-Id: Ifb3ea6101bb48b418844feeca4bea998b2572056
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 04:56:53 +00:00
Milton Wu
270626d5d9 [automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: aac79b894f am: 1ec2b21d42 -s ours am: a78ad20f4c -s ours am: 8611757c28 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961566

Change-Id: If41e2d777ff023e2a7247c5ee50bf8dacd3c2fba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 04:56:51 +00:00
Milton Wu
282c96f7a5 [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: 5cfcf9c636 -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: I76752d30bbc7b75d53f961aafb81b599ade0596a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 04:56:34 +00:00
Milton Wu
66c80feab3 [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: 9ddbe82975 -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: I40f2b4b0e438552574c943541c3b92061087f113
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 04:56:25 +00:00
TreeHugger Robot
6cf39a2066 [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: e1f877e7a6 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961566

Change-Id: I1659051f07b742aeddf093a738ff8f3393b290a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 04:56:13 +00:00
Milton Wu
1678a7c072 [automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: aac79b894f am: 1ec2b21d42 -s ours am: ac8ca06ff1 -s ours am: 41de61129a -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961566

Change-Id: I7e02e49a84bcaf6f9a4148020f1b814609335022
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 04:56:11 +00:00
Milton Wu
4c20faf8d3 [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: e44c4955d6 -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: I2136888d5dd7a1100b6f81e4f0dc7137f3ca06be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 04:56:02 +00:00
TreeHugger Robot
ed226ac949 [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: d584c0c654 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961566

Change-Id: I830646fad97feb1628a2dca3b5e5c4ead604fd27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 04:55:36 +00:00
Milton Wu
4eec32ae80 [automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: aac79b894f am: 23e9e62a23 am: 9c3b6ef6fc -s ours am: f0bc03a3fa -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961566

Change-Id: I14341867c73c2510bb1c09959199effa0f57bfaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 04:55:34 +00:00
Arc Wang
f474582ada Merge "Fix USB OTG hot plug out nndexOutOfBoundsException" am: 6626e50dd8 am: 99cb9d91f1 am: 9f04b02571 am: 9a2052945a am: 7b7c62d78a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2222981

Change-Id: I7b06e7905c0556428bf0453e7a7e8d35013a8b11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 04:54:48 +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
85b6cd3d58 [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: 14ed9ab1c4 -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: Ic757903cdca37b7926ec224db9a946b110913088
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 04:25:45 +00:00
Milton Wu
8a5b173b37 [automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: 27bddff2ac -s ours am: ed094b353b -s ours am: 529896f004 -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: I3dc3665dd07c92df79ee91b4e28b3812974bb971
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 04:25:36 +00:00
TreeHugger Robot
918f7e6c36 [automerger skipped] Merge "[DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern" into tm-dev am: eaabdee25c am: 9983c28b67 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961566

Change-Id: Ie99935fce846f3e02e65f6a2c3a0b8a967c3475d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-09-28 04:25:27 +00:00