Charlotte Lu
93fb316f01
Add ApnDataInit.
...
Fix: 298906796
Test: Unit Test
Change-Id: Ibf9e12e4f9c4ee033ad6dc2ca1f2267bf1f21912
2023-10-08 17:54:40 +08:00
Chaohui Wang
08e24272e4
Create AppDataUsageAppSettingsController
...
For better organization and testings.
Bug: 240931350
Test: manual - on AppDataUsage
Test: unit test
Change-Id: Ie3d35f5d112cf06cca585c9859624d705fbe2655
2023-10-08 17:03:48 +08:00
Zaiyue Xue
834e19b188
Use empty BatteryDiffData instead of null to avoid NullPointerException
...
This is one action post P0 bug b/301362376.
Bug: 304067689
Bug: 303838369
Fix: 304067689
Fix: 303838369
Test: manual
Change-Id: I8bb6bfe9c3fca78ab19dfbfd2a184b0f92f4ef09
2023-10-08 16:38:29 +08:00
Chaohui Wang
4188a571aa
Use network type enum for APN
...
Instead of hardcoded names and values.
Bug: 303971237
Test: unit test
Change-Id: I099a408df7ee35abc886ed5c1d2d09fd31fda7d3
2023-10-08 14:23:37 +08:00
Treehugger Robot
9f49e038a0
Merge "Telephony.Carriers.BEARER is deprecated." into main
2023-10-08 03:33:27 +00:00
Chaohui Wang
c2691b247c
Merge "Not repeat zxing-core dependency" into main
2023-10-07 10:39:21 +00:00
Charlotte Lu
11737b956e
Telephony.Carriers.BEARER is deprecated.
...
Fix: 303971237
Test: Unit Test
Change-Id: Id3257b279421eb9f3544430667dc8ae536476e5c
2023-10-07 17:52:16 +08:00
Chaohui Wang
218ef2f087
Merge "Create AppDataUsageListController" into main
2023-10-07 08:42:42 +00:00
Chaohui Wang
8e2e9e5d3e
Prevent unnecessary reconnection for wifi privacy
...
Before fix, privacy toggle in the Network details page causes a
disconnection + reconnection even when selecting the same setting.
Check current setting first to prevent unnecessary reconnection.
Fix: 303093138
Test: manual - select same privacy setting
Test: unit test
Change-Id: I71208e3cd256fdc0dd5e895fa1a68fdab47aed9a
2023-10-07 15:42:35 +08:00
Chaohui Wang
b19eb9a4c2
Create AppDataUsageListController
...
For better organization and testings.
Bug: 240931350
Test: manual - on AppDataUsage
Test: unit test
Change-Id: I77ceeccc7055fcd948fe40d5dfb9cc4a9b9ad2ee
2023-10-07 15:03:27 +08:00
Charlotte Lu
1735474987
Merge "Add SettingsTextFieldPassword enable." into main
2023-10-07 05:04:50 +00:00
Bill Yi
72eabac183
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If9da2309b45158c64d96649e6cf2ddf7e8e069bb
2023-10-06 19:49:10 -07:00
Bill Yi
71aaccb248
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic29f41f5c8c45d6ff631021a554fd3dbdf1d3be1
2023-10-06 19:47:40 -07: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
b73f33a9e8
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic63ce3d473e11921e249b4e28fcdfe6c31b5561a
2023-10-06 19:43:59 -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
Bill Yi
2568ef188d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2c859bf1bc7257b1b38c6386e76c58e4ad70fe0b
2023-10-06 19:41:40 -07:00
Bill Yi
50bc3c3456
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3d8b7214bd328965623ec33fe7bff5f258d284d4
2023-10-06 19:40:08 -07:00
Xin Li
ec39446b76
[automerger skipped] Merge "Merge Android 14" into main am: dc85f402d5
-s ours am: 1773ab5b6f
-s ours am: dcd4caead2
-s ours am: fdc85fa1cf
-s ours am: 6dd6ff5b88
-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: I297094f91a5dd73653f120b373c6095e61437345
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-07 00:25:49 +00:00
Xin Li
a79e1d31eb
[automerger skipped] Merge Android 14 am: 25d4f12096
-s ours am: 1a19621d28
-s ours am: 453a7cada6
-s ours am: ca02f840e2
-s ours am: be4f23f242
-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: Ifc3c1727dccd8d364ad6b697bc4a06fc589ad0d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-07 00:20:17 +00:00
Bill Yi
1e9ceef6b3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I23f457c626c1bac9026182e2f831408a50aed399
2023-10-06 15:42:54 -07:00
Bill Yi
bd421a22c0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I56ba33264413f9d3db1711ff3a3adb7eff950484
2023-10-06 15:30:27 -07:00
Bill Yi
fd570f63e5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4d73bf6ef88b9591dd13bee6603f3ab9847bab26
2023-10-06 15:24:48 -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
Valentin Iftime
323fbda20e
Validate ringtone URIs before setting
...
Add checks URIs for content from other users.
Fail for users that are not profiles of the current user.
Test: atest DefaultRingtonePreferenceTest
Bug: 299614635
Change-Id: Ib266b285a3a1c6c5265ae2321159e61e08e349f6
2023-10-06 15:44:17 +02:00
Xin Li
6dd6ff5b88
[automerger skipped] Merge "Merge Android 14" into main am: dc85f402d5
-s ours am: 1773ab5b6f
-s ours am: dcd4caead2
-s ours am: fdc85fa1cf
-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: Ief7a0ae2988258d584c86d0af467e54c487bfcaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-06 11:06:20 +00:00
Xin Li
be4f23f242
[automerger skipped] Merge Android 14 am: 25d4f12096
-s ours am: 1a19621d28
-s ours am: 453a7cada6
-s ours am: ca02f840e2
-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: I1ae471f8975c6efab4839dcc4ee3d8126f724ac6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-06 11:00:46 +00:00
Xin Li
fdc85fa1cf
[automerger skipped] Merge "Merge Android 14" into main am: dc85f402d5
-s ours am: 1773ab5b6f
-s ours am: dcd4caead2
-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: I4bf13a408a4d17260564a623962ded44012f6a05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-06 09:56:27 +00:00
Xin Li
ca02f840e2
[automerger skipped] Merge Android 14 am: 25d4f12096
-s ours am: 1a19621d28
-s ours am: 453a7cada6
-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: I42faeb97ff6358cbdcf7e486ad6dcac68e9a9438
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-06 09:50:56 +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
Bill Yi
903af4b595
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7ed1b0ce85
-s ours am: c1c14b739f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24957165
Change-Id: Iffacc2763e2be2a4e46b06582fda18086fbb83f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-06 00:14:13 +00:00
Bill Yi
c1c14b739f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7ed1b0ce85
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24957165
Change-Id: Ice89f11ec484d2148cf67a7bdd4c7c5038895b39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-06 00:00:08 +00:00
Xin Li
25d4f12096
Merge Android 14
...
Bug: 298295554
Merged-In: I8798f723bc821241d70fc8e5cb2c6ae59d7115af
Change-Id: Ied712061a1cecebbb312b9fe1197560205f6963c
2023-10-05 15:41:49 -07:00
Bill Yi
7ed1b0ce85
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7b243481813f39dda575345466ec96b700047c81
2023-10-05 12:11:54 -07:00
Bill Yi
74953b5703
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: ff577eb181
-s ours am: bff9733180
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24947164
Change-Id: I6472568e9587f54a1459f4d5e64ed341add0de75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-05 14:17:29 +00:00
Bill Yi
b702508730
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c96329e0ea
-s ours am: 3a84da72b6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24947164
Change-Id: Ifad7e44d1f7fa6439b07ec778f7e29ab58e8aa95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-05 14:17:21 +00:00
Bill Yi
6cbee3165b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 074f4414b9
-s ours am: 6b55c4fd10
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24946783
Change-Id: I749108664c22521fefbbe55ce5cc810505058f93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-05 14:17:03 +00:00
Bill Yi
bff9733180
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: ff577eb181
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24947164
Change-Id: Ic8bf0a1d16cf28553df8d56f7cb2192f0dc9c576
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-05 13:32:50 +00:00
Bill Yi
3a84da72b6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c96329e0ea
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24947164
Change-Id: I7bbe29a34381ac1d3df282c062467438eec51d89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-05 13:32:42 +00:00
Bill Yi
6b55c4fd10
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 074f4414b9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24946783
Change-Id: I6465c16b725848f7dbb6e2f79e79626d6e23ed5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-10-05 13:32:23 +00:00
Bill Yi
ff577eb181
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-10-05 12:57:34 +00:00
Bill Yi
a223c7644e
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2023-10-05 05:07:58 +00:00
Bill Yi
074f4414b9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I28c0c489fdde63242fd894d923e53a2a412216df
2023-10-04 17:51:12 -07:00
Bill Yi
c96329e0ea
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8267aa212eafd5182fc64ab90f314f4b91cfac64
2023-10-04 17:49:43 -07:00
Gil Cukierman
18403f2adc
Merge changes from topic "cukie-300248708-hide2gremoval" into main
...
* changes:
Stop honoring CarrierConfigManager.KEY_HIDE_ENABLE_2G
Add feature flag for removal of KEY_HIDE_ENABLE_2G
2023-10-04 20:12:53 +00:00