Eric Biggers
c44a165ec7
Merge "ShadowLockPatternUtils: remove patternEverChosen methods" into main am: b862d378bd
am: 12c1013250
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2776713
Change-Id: I3c6492ee12dc88b518079e167583b37435743d20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 21:18:01 +00:00
Eric Biggers
12c1013250
Merge "ShadowLockPatternUtils: remove patternEverChosen methods" into main am: b862d378bd
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2776713
Change-Id: Ib504b453a8caac0789084affcaa70a33e8b554d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 20:11:52 +00:00
Eric Biggers
b862d378bd
Merge "ShadowLockPatternUtils: remove patternEverChosen methods" into main
2023-10-10 19:43:59 +00:00
Bill Yi
eaeb26adb0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: acf52df7a6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979968
Change-Id: I6e63e108831ddddb6617486a291e4964587c0326
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 00:01:26 +00:00
Bill Yi
109fbe94d7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b3e4d7886f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979968
Change-Id: I74a6e4a995aeac3050118524f2c6b8d5d0473543
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 00:01:19 +00:00
Bill Yi
2df55e14e4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1033a2abc6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24979105
Change-Id: I805a3a6dcb7969a4b9169f21d5fb8e2b10b1805a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-10 00:00:59 +00:00
Bill Yi
acf52df7a6
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-10-09 23:12:56 +00:00
Eric Biggers
be262063a7
Merge "ChooseLockPassword: convert to use PasswordMetrics#validateCredential()" into main am: 00f5d9e7a6
am: 335752ed98
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2776714
Change-Id: I7aa857ea6fd3bb5f36e8d6fda1fa27ce6df27f2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-09 21:47:02 +00:00
Eric Biggers
335752ed98
Merge "ChooseLockPassword: convert to use PasswordMetrics#validateCredential()" into main am: 00f5d9e7a6
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2776714
Change-Id: I86824875e218614c30e5150e21f4b63107438ebd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-09 20:50:35 +00:00
Eric Biggers
00f5d9e7a6
Merge "ChooseLockPassword: convert to use PasswordMetrics#validateCredential()" into main
2023-10-09 19:10:53 +00:00
Bill Yi
b3e4d7886f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I785620415ba0ffad64f59ab8c32d37cc4e1957dc
2023-10-06 19:46:10 -07:00
Bill Yi
1033a2abc6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ifbf87c30492d9cf0e06afc59c7d5d97078fd336a
2023-10-06 19:43:08 -07:00
Eric Biggers
3a11c3b0de
ShadowLockPatternUtils: remove patternEverChosen methods
...
These methods are being removed from LockPatternUtils because they are
no longer used, so remove them from ShadowLockPatternUtils too.
Bug: 270013005
Change-Id: If196bbef4755c644b3188043ed47e99817bf1856
Merged-In: If196bbef4755c644b3188043ed47e99817bf1856
(cherry picked from commit 795a02c92a
)
2023-10-06 17:16:55 +00:00
Eric Biggers
b2ea672670
ChooseLockPassword: convert to use PasswordMetrics#validateCredential()
...
Fix the check for invalid characters in new passwords by switching from
PasswordMetrics#validatePassword() to
PasswordMetrics#validateCredential(). For more information, see
frameworks/base change I5c3c55367c3a294578cd0f97ac0e315a11ed517e.
Bug: 219511761
Bug: 232900169
Bug: 243881358
Test: Verified no regressions in 'atest ChooseLockPasswordTest'. Note,
this test is currently @Ignored and has 2 failures. I didn't
attempt to address that.
Test: Set a password containing non-ASCII characters on a device running
an older build. Upgraded and verified unlocking still works.
Tested that setting a new non-ASCII password is not allowed.
Change-Id: I5f1822a34688473cb103eb64dca56e4c19d4dd08
Merged-In: I5f1822a34688473cb103eb64dca56e4c19d4dd08
(cherry picked from commit b547094366
)
2023-10-06 17:16:55 +00:00
Xin Li
dcd4caead2
[automerger skipped] Merge "Merge Android 14" into main am: dc85f402d5
-s ours am: 1773ab5b6f
-s ours
...
am skip reason: Merged-In I8798f723bc821241d70fc8e5cb2c6ae59d7115af with SHA-1 5d8fea06b1
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2777108
Change-Id: Iec9ab42a8a7b6f0d4c98332b87dd9aa982f762c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-06 09:05:00 +00:00
Xin Li
453a7cada6
[automerger skipped] Merge Android 14 am: 25d4f12096
-s ours am: 1a19621d28
-s ours
...
am skip reason: Merged-In I8798f723bc821241d70fc8e5cb2c6ae59d7115af with SHA-1 5d8fea06b1
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2777108
Change-Id: I2b9d48897e2249c58bdd611b530d7092c7b4c3ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-06 08:59:21 +00:00
Xin Li
1773ab5b6f
[automerger skipped] Merge "Merge Android 14" into main am: dc85f402d5
-s ours
...
am skip reason: Merged-In I8798f723bc821241d70fc8e5cb2c6ae59d7115af with SHA-1 5d8fea06b1
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2777108
Change-Id: I318da99fd71bf1b74558f52ca14187e0a2a26f74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-06 07:57:45 +00:00
Xin Li
1a19621d28
[automerger skipped] Merge Android 14 am: 25d4f12096
-s ours
...
am skip reason: Merged-In I8798f723bc821241d70fc8e5cb2c6ae59d7115af with SHA-1 5d8fea06b1
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2777108
Change-Id: I9cb69e26793a7c339bb4e2cf2bc7ade9c7b3ef8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-06 07:52:15 +00:00
Xin Li
dc85f402d5
Merge "Merge Android 14" into main
2023-10-06 05:38:55 +00:00
Xin Li
25d4f12096
Merge Android 14
...
Bug: 298295554
Merged-In: I8798f723bc821241d70fc8e5cb2c6ae59d7115af
Change-Id: Ied712061a1cecebbb312b9fe1197560205f6963c
2023-10-05 15:41:49 -07:00
Matt Pietal
8d4d73f152
Merge "Add support to configure double line clock in lockscreen [2/2]" into main am: 3be411d513
am: 705507d68f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2539870
Change-Id: Icf1ee16bfff74c784b67417dec19f56caf2fd6a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-04 15:23:35 +00:00
Matt Pietal
705507d68f
Merge "Add support to configure double line clock in lockscreen [2/2]" into main am: 3be411d513
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2539870
Change-Id: Ia1bfae20044369b8a8e463e21a2393cf9b6e9250
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-04 14:54:22 +00:00
Matt Pietal
3be411d513
Merge "Add support to configure double line clock in lockscreen [2/2]" into main
2023-10-04 14:25:38 +00:00
Bill Yi
3c00fdbe8e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7b38ca4ff1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24918570
Change-Id: I803cfed0e98c681d6b42fadb6a3ab5d077ddd531
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-03 03:49:07 +00:00
Bill Yi
fddbd76bd8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b563cc2d4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24918570
Change-Id: Id9ec59a7cac6f4e7cd51108f6d5bee2a5d47d1f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-03 03:49:01 +00:00
Bill Yi
8f824b54ea
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e211461744
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24918568
Change-Id: I4fcb7e808a391d3aadda7a376ecdaa6e99dfd86b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-03 03:48:41 +00:00
Bill Yi
7b38ca4ff1
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-10-03 03:09:01 +00:00
Bill Yi
7b563cc2d4
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If497526471c4d717ea029e839456fee636fb5398
2023-10-02 00:08:36 -07:00
Bill Yi
e211461744
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3d1ca601e38b4559f4e9cc88ae6fbea27aaf35fc
2023-10-02 00:02:41 -07:00
Xin Li
2553e934f6
[automerger skipped] Merge UP1A.231005.007 am: f0ba9c8b60
-s ours
...
am skip reason: Merged-In I74cde8ebf8214b314a89452e73b834eac7ae8b1e with SHA-1 75987a1856
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24878503
Change-Id: I35c7d1c5129217358b2e3acbb9033a9ce876a18d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-29 07:15:41 +00:00
Xin Li
f0ba9c8b60
Merge UP1A.231005.007
...
Bug: 291102124
Merged-In: I74cde8ebf8214b314a89452e73b834eac7ae8b1e
Change-Id: If0cc9b99ea3e0e6d908d8c1ed476232d3056cb5d
2023-09-27 16:05:12 -07:00
Bill Yi
aaab0d5237
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7523dceebf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836391
Change-Id: I6fa791dae536c550ee82277a8d8061d2b1c97dca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 20:56:21 +00:00
Bill Yi
082f9d2430
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5ebd68a6e8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836391
Change-Id: Ic74c520defd8ff101ccfb02821fc6420f1954917
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 20:56:17 +00:00
Bill Yi
ae5ef06af9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 6e8a58a104
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836390
Change-Id: Id626d0b31d10c3972d00c566248e6179307e3cc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 20:56:13 +00:00
Bill Yi
e9d30b8c9a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d4d6867b69
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24836390
Change-Id: I3c6dc8d2339634734b6872c0eb34fa204282c2d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 20:55:54 +00:00
Bill Yi
66d77811de
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0d5904fbbb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24830586
Change-Id: I798d24c97ad883a3b30ca506f2ae577675b74aae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-25 20:55:31 +00:00
Bill Yi
7523dceebf
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-09-25 20:05:26 +00:00
Bill Yi
6e8a58a104
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-09-25 20:05:26 +00:00
Bill Yi
5ebd68a6e8
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I22f41d0831d1e6ad0c0a838c83d807e87a3cd782
2023-09-22 02:29:05 -07:00
Bill Yi
d4d6867b69
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7ccbee49f902bcd96c8921da89f80c0987f3b270
2023-09-22 02:23:24 -07:00
Bill Yi
0d5904fbbb
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I69db2d0167009b42daa9942bfc880b36d317ae50
2023-09-22 02:20:18 -07:00
Bill Yi
cca1e959ee
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 880a595859
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744951
Change-Id: If995c1c1d9eb8d5023e42ea8996fa6fdc324f8ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 23:22:23 +00:00
Bill Yi
4e2f191fe5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8d26a94857
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744951
Change-Id: I24d9904d6fef76ba1efe2360858b05f2e3d8dfd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 23:22:19 +00:00
Bill Yi
64677e15d9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: eaa3838179
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744950
Change-Id: Ic39f291d6dd9e58de865f710a5d7cf3a61cbb7c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 23:22:15 +00:00
Bill Yi
ebedb167fc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5753866bb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744950
Change-Id: I348161b5db4874cb2e47bdc560351db4d73ea36d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 23:22:03 +00:00
Bill Yi
b1e0ae99ce
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 883a2b633e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24744004
Change-Id: I896f371b555159556a070588bbdc504a10976fc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-14 23:21:49 +00:00
Bill Yi
880a595859
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-09-14 22:44:17 +00:00
Bill Yi
eaa3838179
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-09-14 22:44:17 +00:00
Anvesh Renikindi
d783537f9f
[automerger skipped] Merge "Remove ExperimentalLifecycleComposeApi" into aosp-main-future am: 7bed4aade8
-s ours
...
am skip reason: Merged-In I8798f723bc821241d70fc8e5cb2c6ae59d7115af with SHA-1 f1febf9e9b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24732669
Change-Id: Ie235b1f2607bed1091844eec8dbff696b2b38807
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-13 17:16:30 +00:00
Chaohui Wang
55a2fe7bd2
[automerger skipped] Remove ExperimentalLifecycleComposeApi am: 5d8fea06b1
-s ours
...
am skip reason: Merged-In I8798f723bc821241d70fc8e5cb2c6ae59d7115af with SHA-1 f1febf9e9b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24732669
Change-Id: I9fd1502569bbd84665220325471551b9661a6a43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-09-13 17:16:23 +00:00