Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
130,730 Commits 1 Branch 0 Tags
f355bc2e01c910155b087ddba7e5b0ab693f7605
Commit Graph

49926 Commits

Author SHA1 Message Date
Chaohui Wang
f355bc2e01 Merge "Migrate PlatformCompat App List to SPA" into udc-qpr-dev am: 879ff5f271 am: 78981afdc2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23410196

Change-Id: I09189fc2dfe6789db9c7745dd43cf5168c2e9dfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-16 09:24:26 +00:00
Chaohui Wang
78981afdc2 Merge "Migrate PlatformCompat App List to SPA" into udc-qpr-dev am: 879ff5f271 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23410196

Change-Id: I8746fd67255bd0799307f403f132e5a1692e41b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-16 08:40:02 +00:00
Chaohui Wang
879ff5f271 Merge "Migrate PlatformCompat App List to SPA" into udc-qpr-dev 2023-06-16 07:59:01 +00:00
Treehugger Robot
67a6f4bada Merge "Guard slices from being requested by guest user" into udc-qpr-dev am: 9718f0e04f am: 068edcc9ec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23578868

Change-Id: I2f514b0c50f853e0ab83104c6abe1add06b7790a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-16 02:47:37 +00:00
Treehugger Robot
068edcc9ec Merge "Guard slices from being requested by guest user" into udc-qpr-dev am: 9718f0e04f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23578868

Change-Id: I0f964c6032f300a82a8873453c78060e131e455e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-16 02:05:03 +00:00
Treehugger Robot
9718f0e04f Merge "Guard slices from being requested by guest user" into udc-qpr-dev 2023-06-16 01:14:40 +00:00
Treehugger Robot
1d070021c0 Merge "Use FakeTimer in test to avoid flakiness." 2023-06-16 00:10:11 +00:00
Treehugger Robot
2f87be66ce Merge "Shutdown secondary SAP automatically" into udc-d1-dev am: 57522f0fcc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23680143

Change-Id: I6b737218b4bec1500ea31218c0b7d13fb0a57f42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 22:15:59 +00:00
Yanli Wan
2445e98020 Merge "Hide Device Lock settings screen if device lock manager is not available" into udc-devicelock-prod am: 2db0f47240 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23684870

Change-Id: Ie16f3870f7e6d5f0939c762f7be2be2b9a8f1f22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 21:09:44 +00:00
Grace Cheng
71a57d8cec Merge "Fix NPE in updateAddPreference" into udc-d1-dev am: 8ba960014c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23672674

Change-Id: Ibde63cfed809364db4fdebdc97b45b7dadce5912
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 20:50:58 +00:00
Yanli Wan
2db0f47240 Merge "Hide Device Lock settings screen if device lock manager is not available" into udc-devicelock-prod 2023-06-15 20:34:59 +00:00
Chun-Ku Lin
802978fd80 Use FakeTimer in test to avoid flakiness. 
**Root cause**
ScreenFlashNotificationColorDialogFragment creates Timer which spawns
unmanageable threads for tests. Also, the test itself uses Thread.sleep
which makes it non-destermistic.

Bug: 279082331
Test: atest ScreenFlashNotificationColorDialogFragmentTest --iteration
20

Change-Id: Id49c8d402a0578f8297ca12fe49da304c7a988d8
 2023-06-15 18:20:23 +00:00
Treehugger Robot
0700358e5d Merge "'Mobile plan' is searchable even if it is unavailable" am: a3f9f42b71 am: 2c73cc8ca8 am: 2010c175a6 am: 2d23561a25 am: c68d307ca8 am: 89639372d5 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2625935

Change-Id: I1075b8cbccae3b80445713e3765307fabeeb12ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 13:59:35 +00:00
Treehugger Robot
89639372d5 Merge "'Mobile plan' is searchable even if it is unavailable" am: a3f9f42b71 am: 2c73cc8ca8 am: 2010c175a6 am: 2d23561a25 am: c68d307ca8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2625935

Change-Id: I7b52296963a9e838863808db52675f454951ace3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 13:09:53 +00:00
Treehugger Robot
c68d307ca8 Merge "'Mobile plan' is searchable even if it is unavailable" am: a3f9f42b71 am: 2c73cc8ca8 am: 2010c175a6 am: 2d23561a25 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2625935

Change-Id: I7f514c59303087a72787d6c0814ede0ecdf0743d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 12:31:02 +00:00
Treehugger Robot
2d23561a25 Merge "'Mobile plan' is searchable even if it is unavailable" am: a3f9f42b71 am: 2c73cc8ca8 am: 2010c175a6 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2625935

Change-Id: I575d1fc77fefd4bd5b441403f0bc88cf7ede8b5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 11:44:07 +00:00
TreeHugger Robot
5cc530b6d5 Merge "Fix bluetooth settings pairing page stuck" into udc-qpr-dev am: a1fd330fb5 am: 32c150e8ea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23657645

Change-Id: I049280a8d5c6654098feace48138e424dde8d040
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 11:02:53 +00:00
Chaohui Wang
782df5c6bf Merge "Remove primaryUserOnly param from UsageStats" into udc-qpr-dev am: 9aa7466cf2 am: afab1d4250 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467963

Change-Id: I772a13b9d70d253c3e63b05bb25b0619823d811c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 10:39:10 +00:00
Treehugger Robot
2010c175a6 Merge "'Mobile plan' is searchable even if it is unavailable" am: a3f9f42b71 am: 2c73cc8ca8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2625935

Change-Id: I9c423f5290eec4f6a8ac68aca4ece6b6675e7a5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 10:33:50 +00:00
TreeHugger Robot
32c150e8ea Merge "Fix bluetooth settings pairing page stuck" into udc-qpr-dev am: a1fd330fb5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23657645

Change-Id: I7bb7e5fd8e647e2f99532ef56effcf9b1f10587d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 10:18:04 +00:00
Chaohui Wang
afab1d4250 Merge "Remove primaryUserOnly param from UsageStats" into udc-qpr-dev am: 9aa7466cf2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467963

Change-Id: I7d4f1d5299aebc1bc01da4def39703a28d7a5fb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 10:16:53 +00:00
Treehugger Robot
2c73cc8ca8 Merge "'Mobile plan' is searchable even if it is unavailable" am: a3f9f42b71 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2625935

Change-Id: Id3c8af985ccaaa05e29238bc3c0bcda257fe132e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 09:50:45 +00:00
TreeHugger Robot
a1fd330fb5 Merge "Fix bluetooth settings pairing page stuck" into udc-qpr-dev 2023-06-15 09:42:19 +00:00
Chaohui Wang
ed6d6c9e0f Migrate PlatformCompat App List to SPA 
So hidden modules are not shown in the list.

This will also improve the developer experience.

Bug: 273913035
Test: Manually with App Compatibility Changes
Test: Unit test
Change-Id: Ic78a51819159a0f848db6173f751b1be8c6b1e70
 2023-06-15 09:37:11 +00:00
Chaohui Wang
9aa7466cf2 Merge "Remove primaryUserOnly param from UsageStats" into udc-qpr-dev 2023-06-15 09:29:39 +00:00
Chaohui Wang
bb47f32011 Fix bluetooth settings pairing page stuck 
There is heavy work to do when add device to list in the
DeviceListPreferenceFragment, off load these work from main thread
to solve the issue.

Make devicePreferenceMap a ConcurrentHashMap to avoid potential race
condition.

Also no longer use getCachedPreference(key) since we not put anything
into the cache, the fallback flow is always used.

Also in BluetoothDevicePreference.onPreferenceAttributesChanged(), move
more heavy work to background thread.

Using System.currentTimeMillis() to sort devices could cause flaky
because System.currentTimeMillis() could be same for different device,
use AtomicInteger instead.

Fix: 286628533
Test: Following the step in bug
Change-Id: Ia9750adb6b4c1424d084381e9d7c2ca8e7912391
 2023-06-15 08:43:17 +00:00
Rhed Jao
07f9d1ccbe Merge "[Settings] Add a verification flow for exiting repair mode" into udc-qpr-dev am: e1c9d65cda am: 721a7bacaa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629341

Change-Id: If01a1c5c13433e85f9b91790375dc2f297777dd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 07:19:57 +00:00
TreeHugger Robot
784119340b Merge "[Settings] Avoid NPE when user enter WifiCallingSettings back and forth" into udc-d1-dev am: 1765c1dc6e am: ee77d651fa am: f5acc230b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695884

Change-Id: Ibfbd74b4c9f2298fe210b22dccf36acb71f3c99c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 07:17:44 +00:00
Rhed Jao
721a7bacaa Merge "[Settings] Add a verification flow for exiting repair mode" into udc-qpr-dev am: e1c9d65cda 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629341

Change-Id: I58bc332082495cf4451228aa8179f6d2e6a2c73b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 06:34:53 +00:00
TreeHugger Robot
f5acc230b3 Merge "[Settings] Avoid NPE when user enter WifiCallingSettings back and forth" into udc-d1-dev am: 1765c1dc6e am: ee77d651fa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695884

Change-Id: I70bef64fcefc75fc3d3496c76d4af9c85efdd9c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 06:31:38 +00:00
Mill Chen
d4eecf6132 Guard slices from being requested by guest user 
According to patch of A-231987122, AOSP restricts app to modify relevant
mobile settings when user is a guest. This change intends to prevent the
slices related to mobile settings from being requested by guest user.

Bug: 278616139
Bug: 277333776
Bug: 262244832
Bug: 278616520
Bug: 278615120
Test: robotests
Change-Id: I4dc4bbfdb5cf76e188e6f62ebfd74ef6fa2fe33b
 2023-06-15 14:29:01 +08:00
TreeHugger Robot
ee77d651fa Merge "[Settings] Avoid NPE when user enter WifiCallingSettings back and forth" into udc-d1-dev am: 1765c1dc6e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695884

Change-Id: I8bbc5d48e272ab0a5b7880f1ee3b99043df64665
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 05:00:40 +00:00
Rhed Jao
e1c9d65cda Merge "[Settings] Add a verification flow for exiting repair mode" into udc-qpr-dev 2023-06-15 04:55:45 +00:00
Treehugger Robot
0f2e581635 Merge "[Settings] Imporve MMS message UI state update" into udc-d1-dev am: 8182348d5c am: d4aa1b65a5 am: 0b25525328 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23669450

Change-Id: I78f6be87145c2320113e6d10733d96a14dec59f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 04:47:52 +00:00
Chaohui Wang
6754587edd Merge "Call onViewCreated in DashboardFragment" into udc-qpr-dev am: 8617f63823 am: 5d847e0207 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23659924

Change-Id: I7ae7f969a3d69849c59fdc6e7a7f44f0c8458f87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 04:42:34 +00:00
Treehugger Robot
0b25525328 Merge "[Settings] Imporve MMS message UI state update" into udc-d1-dev am: 8182348d5c am: d4aa1b65a5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23669450

Change-Id: I403765aae030e5b1aea4482fc161a43932148b30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 04:38:06 +00:00
TreeHugger Robot
1765c1dc6e Merge "[Settings] Avoid NPE when user enter WifiCallingSettings back and forth" into udc-d1-dev 2023-06-15 04:07:32 +00:00
Chaohui Wang
5d847e0207 Merge "Call onViewCreated in DashboardFragment" into udc-qpr-dev am: 8617f63823 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23659924

Change-Id: I71e428a2a332e4ed6f3d4719c28cb5408aeaeb51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 03:59:56 +00:00
Treehugger Robot
d4aa1b65a5 Merge "[Settings] Imporve MMS message UI state update" into udc-d1-dev am: 8182348d5c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23669450

Change-Id: I159952074306255db4397de180ee4b49eb78613b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 03:53:50 +00:00
Treehugger Robot
8182348d5c Merge "[Settings] Imporve MMS message UI state update" into udc-d1-dev 2023-06-15 03:02:41 +00:00
Chaohui Wang
8617f63823 Merge "Call onViewCreated in DashboardFragment" into udc-qpr-dev 2023-06-15 03:00:52 +00:00
tom hsu
8bb09238bb [Settings] Avoid NPE when user enter WifiCallingSettings back and forth 
Bug: 277833102
Test: Manual test
Change-Id: Ifd3272ddf8b8a27fc7772d860653df2c33a3df7b
 2023-06-15 02:58:42 +00:00
Rhed Jao
b7a4a7daa4 [Settings] Add a verification flow for exiting repair mode 
Handles the ACTION_CONFIRM_REPAIR_MODE_DEVICE_CREDENTIAL
intent to launch the confirm device credential activity for
users to exiting repair mode. The activity passes a special
user id USER_REPAIR_MODE to the framework and verify credentials
that the user enrolled in normal mode.

Bug: 277561275
Test: am start -a android.app.action.PREPARE_REPAIR_MODE_DEVICE_CREDENTIAL
      settings put global repair_mode_active 1
      am start -a android.app.action.CONFIRM_REPAIR_MODE_DEVICE_CREDENTIAL
      The credential is verified successfully.
Change-Id: I9ffe32f9925ee2b990c49d5674d27196a4c9edf7
 2023-06-15 02:14:41 +00:00
Hao Dong
9e1435a0dc Merge "Wait for systemui udfps overlay ready to show settings udfps enroll view." into udc-qpr-dev am: 61659799de am: a9f1ed3501 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23595181

Change-Id: I88d843e5c1164e054d4cb48e3f953618e63e2e64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 01:46:36 +00:00
Hao Dong
a9f1ed3501 Merge "Wait for systemui udfps overlay ready to show settings udfps enroll view." into udc-qpr-dev am: 61659799de 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23595181

Change-Id: Ia545f7902df20a47c6dc154cfb3d781541bb25ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 01:45:55 +00:00
Hao Dong
61659799de Merge "Wait for systemui udfps overlay ready to show settings udfps enroll view." into udc-qpr-dev 2023-06-15 01:22:22 +00:00
Treehugger Robot
e133e733ae Merge "Fix Hotspot & tethering settings crash" into udc-d1-dev am: 3494d09de4 am: 03b39bc5d3 am: 1772660414 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23691725

Change-Id: I67c72c08388c71765320f3d2b2e87369bdc275f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 20:09:47 +00:00
SongFerng Wang
059a9fa42f Merge "Remove the owner" am: 286344d539 am: 448c8b61a8 am: 61ef9024c8 am: 7f29649aa9 am: 2a6553b122 am: 143d1f50ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23688861

Change-Id: I7b01d3754f471f4584bc805fc9914dffac4eed09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 20:07:11 +00:00
Matías Hernández
88bfc017fa Don't hide approved NLSes in Settings am: ff255c6eda am: 50df60c93c am: a49e14f8ff am: 0aa241be99 am: 2b1faa0aea am: dcbe38baa9 am: e8cfc9cb3d am: 4c941d3a97 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23563580

Change-Id: Ic16366122cb83cc770254a12a49a1f22370260da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 19:11:37 +00:00
Treehugger Robot
1772660414 Merge "Fix Hotspot & tethering settings crash" into udc-d1-dev am: 3494d09de4 am: 03b39bc5d3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23691725

Change-Id: I04e22d89b03c0e0b303357d5495db85343e4911f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 19:10:58 +00:00