Eric Biggers
80ef1e0ff5
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 5f07aba150
-s ours am: 733d83d27b
-s ours am: aa93927b87
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24298399
Change-Id: I042c8f4fb621028ceaefb1340090113663cbbb75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 02:16:48 +00:00
Eric Biggers
94573f96bb
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: e0b5a793a1
am: 257bc2eda1
-s ours
...
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 423c0e0d47
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301337
Change-Id: I54f02689dc9ac8b5c9fed1a21cb692aa4fe6a89a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 02:16:45 +00:00
Eric Biggers
aa93927b87
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 5f07aba150
-s ours am: 733d83d27b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24298399
Change-Id: Iee3107d98140efd520924ba05c7f592d54b6e8d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 01:56:39 +00:00
Eric Biggers
c86183ec60
[automerger skipped] Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into tm-qpr-dev am: 94ffd66957
-s ours am: 7bed9704c9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301336
Change-Id: I6fb8b7198d1f4199b64cb0540091208847704aad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 01:55:35 +00:00
Eric Biggers
2f8d8d1d79
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 423c0e0d47
-s ours am: 8360c2e940
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301336
Change-Id: If8220391370f5485505e0990ed9d71b513a21c78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 01:55:29 +00:00
Eric Biggers
bf4f533ea6
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: b30cf4e8cb
-s ours am: d1a31c8619
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301340
Change-Id: I4cdcfeaf7c26b88a83a3f62151f60cd6bc35b2bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 01:54:27 +00:00
Eric Biggers
06c2588645
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 99be30f895
-s ours am: 7475b96786
-s ours am: 2ce24a1fa9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301338
Change-Id: I5b558e9a8b46f465fa87be7d5232239bb7eec3b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 01:38:41 +00:00
Eric Biggers
355e257668
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 99be30f895
-s ours am: 7475b96786
-s ours am: 2ce24a1fa9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301338
Change-Id: Ia1117d236897eaa24976b2c809ae8fa13d568f6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 01:37:31 +00:00
Eric Biggers
bf33df4d79
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 6e92ca106e
-s ours am: 81bd8912af
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24299129
Change-Id: I05baeebef5abb0d46da580535914772270bb6325
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 01:37:27 +00:00
Eric Biggers
e176ec56dc
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 6e92ca106e
-s ours am: 81bd8912af
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24299129
Change-Id: Ia49cf6e2e8ca30f5a427ff26060a72604f36e071
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 01:36:55 +00:00
Eric Biggers
733d83d27b
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 5f07aba150
-s ours
...
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 b30cf4e8cb
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24298399
Change-Id: I102d20d2e914a442e768ca7446601bfa51eac20d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 01:36:53 +00:00
Eric Biggers
257bc2eda1
RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: e0b5a793a1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301337
Change-Id: I701bf72cefdaaeb465123aa1aedb581ab6408157
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 01:35:24 +00:00
Eric Biggers
011f39e944
RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: e0b5a793a1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301337
Change-Id: I8607f271c5daf117b25502b572598e48dc2de30f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 01:35:06 +00:00
Eric Biggers
d1a31c8619
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: b30cf4e8cb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301340
Change-Id: I100f99e9a0c7495f733b97d9f93decfe905ba7a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 01:34:09 +00:00
Eric Biggers
7bed9704c9
[automerger skipped] Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into tm-qpr-dev am: 94ffd66957
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301336
Change-Id: I7f6f74c706a397cfbad6685c152c015906a63b74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 01:31:46 +00:00
Eric Biggers
67c4be1e52
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 50cb0a35c9
-s ours
...
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 99be30f895
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301339
Change-Id: I65063522e32f96f27f7d7eb51c882e761ad29c02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 01:31:46 +00:00
Eric Biggers
8360c2e940
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 423c0e0d47
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301336
Change-Id: I41c8afe636e06554df78cc253b93e6dfea887f2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 01:31:36 +00:00
Eric Biggers
2ce24a1fa9
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 99be30f895
-s ours am: 7475b96786
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301338
Change-Id: I35f68ccc8b118df5340a679e9a8c128055486ec6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 01:15:38 +00:00
Eric Biggers
81bd8912af
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 6e92ca106e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24299129
Change-Id: Icfbce08c030aac4ac4532bf4535970c2a97f22f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 01:14:44 +00:00
Eric Biggers
7475b96786
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 99be30f895
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301338
Change-Id: I72421fe89e4b0ed32f193384805bc502e0f24f9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 01:11:34 +00:00
Eric Biggers
94ffd66957
Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into tm-qpr-dev
2023-08-08 00:51:38 +00:00
Eric Biggers
00885a8cb5
Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into udc-qpr-dev
2023-08-08 00:50:18 +00:00
Wenhui Yang
c2b7914778
Merge "Add bp subtitle for WiFi sharing" into udc-qpr-dev
2023-08-07 19:55:44 +00:00
Matt Casey
39715d3023
Merge "Remove dependency on ChooserActivity resources" into udc-qpr-dev
2023-08-07 17:56:15 +00:00
Bill Yi
b3f9242eac
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d56eb42615
-s ours am: 45eb3572ff
-s ours am: 0e59758074
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24318271
Change-Id: I30985eb65054367e947348f01e183b85f70b2fa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-05 08:19:17 +00:00
Bill Yi
0e59758074
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d56eb42615
-s ours am: 45eb3572ff
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24318271
Change-Id: Ieb0b6e5f6b38a23bece7bad0a115c3e4eb5e423c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-05 07:55:45 +00:00
Bill Yi
45eb3572ff
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d56eb42615
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24318271
Change-Id: I2bf6035ffd109a82ecc2cb743b57bf020cdb3053
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-05 07:11:15 +00:00
Bill Yi
a1bb52d905
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-08-05 03:31:44 +00:00
Etan Cohen
dca9c6b88f
Merge "Fix WiFi (ZX or DPP) QR code parsing to ignore leading spaces" into udc-qpr-dev
2023-08-04 23:36:38 +00:00
Bill Yi
a71fa5cbcb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d447dcfcea
-s ours am: f3ddb4a624
-s ours am: b8f4dd6e0f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24318268
Change-Id: I5ffb7fc9f1f9285984b1b900338d2077a0d2703b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-04 20:45:40 +00:00
Bill Yi
b8f4dd6e0f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d447dcfcea
-s ours am: f3ddb4a624
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24318268
Change-Id: Id9b01d4dd30afbe01e3777c89da2a3db86943ce6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-04 19:54:35 +00:00
Bill Yi
b8d9ca8b86
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 74fd980e5f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24319518
Change-Id: Ia9d027022ed5817aa9eaca923edd1161f1b6c1a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-04 19:36:33 +00:00
Bill Yi
f3ddb4a624
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d447dcfcea
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24318268
Change-Id: If487bb3281585de22121dd4240bb566be4584ffc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-04 19:15:48 +00:00
Liahav Eitan
804104ce36
Merge "Fix theming on Forgot your password work challegne screen" into udc-qpr-dev
2023-08-04 17:19:02 +00:00
Weng Su
28be567a83
Show policy transparency dialog for Wi-Fi network restrictions
...
- In order to support various user restrictions of individual Wi-Fi networks, WifiEntry provides the hasAdminRestrictions method for unified management.
- Settings will refer to WifiEntry#hasAdminRestrictions to restrict individual Wi-Fi networks.
Bug: 289448751
Bug: 289951241
Test: manual test
atest -c LongPressWifiEntryPreferenceTest
Change-Id: Iae5996a87ee72a3073300c7f62dfa14a9f31c21d
2023-08-04 07:18:28 +00:00
Yu Chao (zhào-yò)
8053947766
Merge "Migrate VpnSettings from RestrictedSettingsFragment to RestrictedDashboardFragment." into udc-qpr-dev
2023-08-04 06:28:05 +00:00
Yu Chao
68e466ff01
Migrate VpnSettings from RestrictedSettingsFragment to RestrictedDashboardFragment.
...
This is required for adding an overlay vpn_settings2.xml for Tips
Button.
Test: VpnSettingsTest
Bug: 293213974
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f9ca569249331a062e6f58a49bb0bb53aa69b3db )
Merged-In: I26531afe75215c9531c0122d2e86fd5d0da4d3db
Change-Id: I26531afe75215c9531c0122d2e86fd5d0da4d3db
2023-08-04 05:51:48 +00:00
Bill Yi
d56eb42615
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I88df717cf88e78ce5cbe17b53f50dbccf03aecf2
2023-08-03 20:29:24 -07:00
Bill Yi
74fd980e5f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9dc5389350ec7cb3c1988eb69fc5c23c5c50707d
2023-08-03 20:27:38 -07:00
Bill Yi
d447dcfcea
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I36696445b89cb0d0dd94aa210d559a6c60a79d82
2023-08-03 20:21:12 -07:00
Zoey Chen
9635d1cf45
Merge "[Regional Preference] Add description for checked/not checked" into udc-qpr-dev
2023-08-04 02:20:11 +00:00
Bill Yi
031764a37e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ibb4f0fad54cd19b36bab1f95675a1a006a65734d
2023-08-03 17:55:41 -07:00
Yuyang Huang
b40e5c2228
Merge "Enable/Disable ASHA profile with LE audio toggle" into udc-qpr-dev
2023-08-03 22:20:35 +00:00
Bill Yi
d30110938b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c52abcd3fa
-s ours am: c9c69ea360
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24309430
Change-Id: Iacac202218bc55ef63d7c123db16fac26c554e69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-03 20:29:06 +00:00
Bill Yi
c9c69ea360
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c52abcd3fa
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24309430
Change-Id: Ia533f5f510595ee2d748364f1e30e8b8a9a4a911
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-03 19:43:11 +00:00
Bill Yi
c52abcd3fa
Import translations. DO NOT MERGE ANYWHERE
...
BUG:291684185
Auto-generated-cl: translation import
Change-Id: Ia444bb69cc499bd8d4a5ffc8c72babdda213c385
2023-08-03 11:04:31 -07:00
Etan Cohen
0fb1a3b3a7
Fix WiFi (ZX or DPP) QR code parsing to ignore leading spaces
...
Increase robustness of QR code parsing: while leading spaces aren't
expected (or allowed) they are observed in the wild and can be safely
ignored.
Bug: 292331368
Test: validated that QR code with scan is now parsed correctly
Test: atest WifiQrCodeTest
Change-Id: Ifff79870bea2ec9924f7b2e8100c2c01fd350846
2023-08-03 14:25:38 +00:00
Graciela Putri
830c9eec71
Merge "Add intent to access aspect ratio app list page" into udc-qpr-dev
2023-08-03 08:23:58 +00:00
Bill Yi
3e25353a21
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6a05d24aeb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24299822
Change-Id: Ic96fddd3151d389e8871be0dd3ec46df6ee9392f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-03 00:37:45 +00:00
Eric Biggers
50f93771bc
RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()
...
When LockPatternUtils#setLockCredential() fails, it can either return
false or throw an exception. Catch the exception and treat it the same
way as a false return value, to prevent crashing com.android.settings.
Bug: 253043065
Test: Tried setting lockscreen credential while in secure FRP mode using
smartlock setup activity launched by intent via adb. Verified
that com.android.settings no longer crashes due to the exception
from LockPatternUtils#setLockCredential().
Change-Id: I48b9119c19fb6378b1f88d36433ee4f4c8501d76
(cherry picked from commit 05f1eff1c9
)
Merged-In: I48b9119c19fb6378b1f88d36433ee4f4c8501d76
2023-08-02 23:45:19 +00:00