PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
138,921 Commits 1 Branch 0 Tags
76d7864bc6dfca0d2ee25576489c1cc4936f0587
Commit Graph

138921 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kevin Liu
76d7864bc6 Merge "Add strict_mode: false" into main 2024-06-18 03:07:47 +00:00
Xin Li
87973cf893 Merge "Merge Android 14 QPR3 to AOSP main" into main 2024-06-17 18:51:35 +00:00
Xin Li
ef55516656 Merge Android 14 QPR3 to AOSP main 
Bug: 346855327
Merged-In: If518bbb88342ae4c2e5e9f131727de58446be780
Change-Id: I4384e446922d66808c73cbf52627f2e8db7fa7af
 2024-06-13 10:50:27 -07:00
Pawan Wagh
cb7bd9dd74 Merge "Move Enable16KbTest to device-tests" into main am: df6affdc3d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3123771

Change-Id: If518bbb88342ae4c2e5e9f131727de58446be780
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-12 01:27:02 +00:00
Pawan Wagh
df6affdc3d Merge "Move Enable16KbTest to device-tests" into main 2024-06-12 01:10:40 +00:00
Pawan Wagh
3aa1405acb Move Enable16KbTest to device-tests 
general-tests are not configured for the devices
which should be tested. Moving test to device-test suite.

Test: m Enable16KbTest && atest -c Enable16KbTest
Bug: 345763025
Change-Id: I01abf4ec91c4f7b588de12ac9cb71b805849e4ac
 2024-06-10 21:19:27 +00:00
Treehugger Robot
95da1e4de2 Merge "Fix NPE force close if disabling BT feature" into main am: 1bb8e28762 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3118024

Change-Id: Ibb00cb80a1d0c34a5a73f26b21ebe212692fc49c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-07 08:56:58 +00:00
Treehugger Robot
1bb8e28762 Merge "Fix NPE force close if disabling BT feature" into main 2024-06-07 08:35:48 +00:00
hoffc
de3f413ecd Fix NPE force close if disabling BT feature 
adapter can be null in some SPs which disable bluetooth feature
from framework, so it will lead to NPE force close in these SPs.

Add null check for adapter.

Bug: 345584461

Change-Id: I3fabe94a97cc9baf7b1739fe1c9160a52b50d7d4
 2024-06-07 13:00:03 +08:00
Xin Li
9bf082ae01 Merge "Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future" into aosp-main-future 2024-06-06 20:54:42 +00:00
Julie Pan
33e2eb32fa Merge "Remove beccahughes@google.com from src/com/android/settings/applications/credentials/OWNERS" into main am: ce2a5e07e2 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3118591

Change-Id: I46352b557bef347fd55d89c0fbdd29d87d52c1bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-06 19:54:52 +00:00
Julie Pan
ce2a5e07e2 Merge "Remove beccahughes@google.com from src/com/android/settings/applications/credentials/OWNERS" into main 2024-06-06 19:25:25 +00:00
Owner Cleanup Bot
88ab066a66 Remove beccahughes@google.com from src/com/android/settings/applications/credentials/OWNERS 
This suggested change is automatically generated based on group
memberships and affiliations.
If this change is unnecessary or in error, vote CR -1 and the bot
will abandon it. Vote CR +1/2 to approve this change.

See the owner's recent activity for context:
https://android-review.googlesource.com/q/beccahughes@google.com

To report an issue, file a bug in the Infra>Codereview component.

Change-Id: I8563f73848a4e32ff3da4b1eaf34253374d9012c
 2024-06-06 17:47:53 +00:00
Treehugger Robot
8c0d308276 Merge "Add Enable16KbTest to TEST_MAPPING" into main am: c3c33df4fc 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3111923

Change-Id: I374aa31dde3f310e30462e82422dca679274ebee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-06 16:47:02 +00:00
Treehugger Robot
c3c33df4fc Merge "Add Enable16KbTest to TEST_MAPPING" into main 2024-06-06 16:28:25 +00:00
Treehugger Robot
cd33904187 Merge "Fix test config" into main am: 4f19466f56 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3114506

Change-Id: I96194603f06e24effecbbf3f04cbea01e21e7c0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-06 15:46:18 +00:00
Treehugger Robot
4f19466f56 Merge "Fix test config" into main 2024-06-06 15:35:07 +00:00
SongFerng Wang
5a979e94a8 Merge "Show cdma network mode choices" into main am: 392f07f415 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3107999

Change-Id: I61a5556361fe2109864b6e7e10d47e081930d13c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-06 14:24:26 +00:00
SongFerng Wang
392f07f415 Merge "Show cdma network mode choices" into main 2024-06-06 14:07:58 +00:00
Pawan Wagh
9021526247 Fix test config 
test app was failing to install when running in integration due to
shared uid. Removing the sharedUid field from test.

Test: m Enable16KbTest && atest -c Enable16KbTest
Bug: 341995374

Change-Id: I37f481c552f8f0779bcd8c69cf4e40598590f5db
 2024-06-05 23:02:50 +00:00
Xin Li
3c3a1cc6c6 Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future 
Bug: 343100748
Merged-In: Id3d79805bb2289b84ad34ac05a97e50f0410502f
Change-Id: I70f531e800ed5f3765a100b5b5cecb99664c1dbc
 2024-06-05 14:12:13 -07:00
Pawan Wagh
78cd8ba4f6 Merge "Integration tests for 16kb dev option" into main am: 3abf3a0f8c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3111722

Change-Id: I1a9980d2857017bfd3d6808561b020bfa35dd32d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-06-05 03:08:45 +00:00
Pawan Wagh
3abf3a0f8c Merge "Integration tests for 16kb dev option" into main 2024-06-05 02:53:06 +00:00
Pawan Wagh
0dbc009db1 Add Enable16KbTest to TEST_MAPPING 
Test: m Enable16KbTest && atest -c Enable16KbTest
Bug: 341995374
Change-Id: I92bf4a92dcb9fed4d4ae3cb35f6032b095a640d3
 2024-06-04 23:12:39 +00:00
Pawan Wagh
10ff699b99 Integration tests for 16kb dev option 
Adding tests to verify end to end functionality for dev options.
This test verifies
- /data reformatting to ext4
- switching to 16kb kernel
- switching back to 4kb kernel
- Persistent notifications in page-agnostic mode
- Disabling developer option in page-agnostic mode

Test: m Enable16KbTest && atest -c Enable16KbTest
Bug: 341995374
Change-Id: Ieaa149831b5205a15b259982f0349dc94d4fae92
 2024-06-04 23:11:37 +00:00
Kevin Liu
8c1d5ff5b6 Add strict_mode: false 
As strict mode is in place, the default strict_mode is now set to true. We are encourage teams to write tests in strict_mode to make tests Bivalent (able to run on device and devicelessly)
For more info on strict mode: go/roboStrictMode

Test: atest SettingsRoboTests
Bug: 334089788
Change-Id: I4381446dac381a34747043c564cf5288a2e16725
Merged-In: I4381446dac381a34747043c564cf5288a2e16725
 2024-06-04 00:32:42 +00:00
Ganesh Vilas Chaudhari
b300cae17d Show cdma network mode choices 
- Show cdma network mode choices if current radio supports 3GPP and
  3GPP2 radio technologies at the same time

Change-Id: I2d849e2eddc2c5bef289f39c015ebc6c744edcab
 2024-05-30 14:32:02 +05:30
Xin Li
f0e00b8bf7 Merge Android 24Q2 Release (ab/11526283) to aosp-main-future 
Bug: 337098550
Merged-In: I96574a79eba581db95d387f0d9c9fde2e004c41c
Change-Id: Ib9f2c742f8aa72651ef9eca80a716dd94b9041ea
 2024-05-23 14:12:07 -07:00
Pawan Wagh
418897702e Merge "Fix strings for dev options" into main am: cfb1ffb5d3 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3097858

Change-Id: Ib93c2a0fad9f002212d93cda296be61fb297305a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-23 07:13:05 +00:00
Pawan Wagh
cfb1ffb5d3 Merge "Fix strings for dev options" into main 2024-05-23 06:45:37 +00:00
Pawan Wagh
0ed57b79a6 Fix strings for dev options 
Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Bug: 295035851
Bug: 339878739
Change-Id: Id6f3ad503ac6c01209a67d1bc46a47b2bbd911af
 2024-05-22 21:54:12 +00:00
Lais Andrade
e2d8c52b71 Merge "Update haptic settings owners" into main am: 1c3e44a2da 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3093005

Change-Id: I8e673cf6ddb5a805e8f9e759f39fa8d5e57c1191
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-20 17:35:43 +00:00
Lais Andrade
1c3e44a2da Merge "Update haptic settings owners" into main 2024-05-20 17:11:17 +00:00
Lais Andrade
6eeddc8c29 Update haptic settings owners 
Bug: 338334977
Change-Id: I789268bda12a5cc6ff49b0adfaf41a42e52d64d6
Test: N/A
 2024-05-20 16:54:06 +00:00
Treehugger Robot
2626849471 Merge "Update Setting's Robolectric tests' instructions" into main am: 2fcc3a20e5 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3083379

Change-Id: I63bc87d3d5af1887be7cbe8b1d0d314b82efa7b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-13 17:51:04 +00:00
Treehugger Robot
2fcc3a20e5 Merge "Update Setting's Robolectric tests' instructions" into main 2024-05-13 17:36:07 +00:00
David Liu
aa9702134d Merge "Set noparent to avoid it recursively looks up. Android biometric team should approve all change in this subdirectories." into main am: 7220a11daf 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3080723

Change-Id: Ia661424fd58c58f580305bd1c861e26912e8a0f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-13 16:46:40 +00:00
David Liu
7220a11daf Merge "Set noparent to avoid it recursively looks up. Android biometric team should approve all change in this subdirectories." into main 2024-05-13 16:23:57 +00:00
Treehugger Robot
0b6c1a781a Merge "[Thread] fix flaky Thread settings tests" into main am: 5a7eeea1e1 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3081385

Change-Id: I2b5665c65fdceed258a0c902be8fd3f8ff3703b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-13 09:46:16 +00:00
Treehugger Robot
5a7eeea1e1 Merge "[Thread] fix flaky Thread settings tests" into main 2024-05-13 09:21:28 +00:00
Kangping Dong
253be810ae [Thread] fix flaky Thread settings tests 
This fix the flaky issue by using the directExecutor()

Bug: 340148095
Change-Id: Ib0ed0f660828ec3c2601b4fc0b3360e891eb48af
 2024-05-13 16:14:56 +08:00
Pawan Wagh
588dbe4b31 Merge "UI and error message fixes for 16k developer option" into main am: e550896658 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3079811

Change-Id: Id0bf33ca5fce8a964cb7b4ae0365c318993b2b3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-11 03:32:02 +00:00
Pawan Wagh
e550896658 Merge "UI and error message fixes for 16k developer option" into main 2024-05-11 03:06:28 +00:00
Chun-Ku Lin
01463cac05 Update Setting's Robolectric tests' instructions 
Test: N/A

Change-Id: I00a0b3ac910caaeb35f66762a9d67610b9180ff6
 2024-05-11 02:29:57 +00:00
Treehugger Robot
fc2d8c650f Merge "[Thread] fix Thread unit test failures" into main am: bb5bb304aa 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3081467

Change-Id: I615a740f9141e2c16a8e4a9c674a52e1e55b0e99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-10 10:45:37 +00:00
Treehugger Robot
bb5bb304aa Merge "[Thread] fix Thread unit test failures" into main 2024-05-10 10:18:40 +00:00
Chaohui Wang
5998074b89 Merge "Use permission com.android.settings.BATTERY_DATA" into main am: 51fe6894f9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3078823

Change-Id: I1fac29bf240989aa4528b4abdaf77c94d9d1b08a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-10 09:37:56 +00:00
Chaohui Wang
51fe6894f9 Merge "Use permission com.android.settings.BATTERY_DATA" into main 2024-05-10 09:15:47 +00:00
Kangping Dong
257e164562 [Thread] fix Thread unit test failures 
It looks like SettingsUnitTests is not in presubmit and the existing Thread settings unit tests are failing in postsubmit.

This commit fixes two small issues:
1. The default Thread enabled state in FakeThreadNetworkController and ThreadNetworkToggleController is not consistent
2. The executor in ThreadNetworkToggleControllerTest is reusing the main thread which could result in flaky as the callbacks are not guaranteed to be invoked before the API returns

Bug: 339767488
Bug: 339145155
Test: atest SettingsUnitTests:com.android.settings.connecteddevice.threadnetwork.ThreadNetworkToggleControllerTest
Change-Id: Id8b453cf6d7bef698d08dbf106e48250369d0832
 2024-05-10 17:10:50 +08:00
Kangping Dong
0ff02951c2 Merge "[Thread] update Thread settings screen" into main am: ba221ea50c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3074147

Change-Id: Ib9437a53f2e94a27b22b0b38e30f7dee1a96c741
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-05-10 07:02:06 +00:00