Commit Graph

137709 Commits

Author SHA1 Message Date
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
c3c33df4fc Merge "Add Enable16KbTest to TEST_MAPPING" into main 2024-06-06 16:28:25 +00:00
Treehugger Robot
4f19466f56 Merge "Fix test config" into main 2024-06-06 15:35:07 +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
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
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
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
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
2fcc3a20e5 Merge "Update Setting's Robolectric tests' instructions" into main 2024-05-13 17:36:07 +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
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
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
bb5bb304aa Merge "[Thread] fix Thread unit test failures" into main 2024-05-10 10:18:40 +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
ba221ea50c Merge "[Thread] update Thread settings screen" into main 2024-05-10 06:38:45 +00:00
David Liu
836e14e665 Set noparent to avoid it recursively looks up. Android biometric team should approve all change in this subdirectories.
Change-Id: Ib5bdc23660cc18af0f57ffdec1dbf582db734a43
2024-05-09 22:15:14 +00:00
Kangping Dong
ab7f48dcde [Thread] update Thread settings screen
Per b/327098435 the new Thread settings design proposed
(go/android-thread) is approved.

As a summary, this commit adds a new "connected devices > connection
preference -> Thread" list item and decidated config page for Thread.
Also, we simplified the airplane mode to delegate it to the mainline
code to handle it

Bug: 327098435
Test: atest SettingsUnitTests
Merged-In: Iffbb2471f5a28ec57d30a378f22642fe6ac0b9cc
Change-Id: Iffbb2471f5a28ec57d30a378f22642fe6ac0b9cc
2024-05-09 14:19:13 +08:00
Ang Li
1d591b26a9 Merge "Adapt to the new API of ShadowCaptioningManager." into main 2024-05-08 23:35:52 +00:00
Ang Li
f0e6f12f10 Adapt to the new API of ShadowCaptioningManager.
Test: Presubmit.
Change-Id: If90894a2438ff5e0aec8e727036f7a656f4c712a
2024-05-08 22:16:33 +00:00
Pawan Wagh
f815608a71 UI and error message fixes for 16k developer option
- Disallow disabling option when hardware offload
values aren't default ones. This was bypassing warning dialogue
- For ext4 format dialog, add a delete icon and change confirmation text
- Change error message when update is pending.
- Add padding to progress dialog

Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Bug: 295035851
Bug: 338139884
Change-Id: Ib1c3ac075a75a8515fe725103b062983ecf11fba
2024-05-08 20:49:12 +00:00
Chaohui Wang
0887ee4540 Use permission com.android.settings.BATTERY_DATA
In SettingsSpaUnitTests

Change-Id: Ic1bec601e773389813bce4e7663ce08c41fa3deb
Fix: 338300477
Test: presubmit
Merged-In: I5a1753835d2d47712ea249081c9a77c455eb3291
2024-05-08 04:55:37 +00:00
SongFerng Wang
12d49a521c Merge "Refacotr mobile data observer for repository" into main 2024-05-08 04:00:00 +00:00
Mengjun Leng
294e0db163 Refacotr mobile data observer for repository
In current design, the mobile data observer might be removed due to
SIM absence after registered so that mobile data network info can't
be updated to clients.

To fix it, migrate it to use API TelephonyCallback.onUserMobileDataStateChanged

Bug: 327696232
Test: manual + unit tests

Change-Id: I26c8f946823abb7505f0227c8dd8ab0700d0c5f2
Merged-In: I26c8f946823abb7505f0227c8dd8ab0700d0c5f2
2024-05-08 01:39:44 +00:00
Pawan Wagh
ef175b48f8 Merge "Turn off automatic updates in page-agnostic mode" into main 2024-05-07 14:11:01 +00:00
Treehugger Robot
0d124654ca Merge "Disallow turning off developer options in page-agnostic mode" into main 2024-05-07 06:30:59 +00:00
Pawan Wagh
e4b9c69442 Disallow turning off developer options in page-agnostic mode
When device is in page-agnostic mode, it would be OEM unlocked and
filesystem will be different than production. Don't allow to turn
off developer options in that state.

Bug: 329657279
Bug: 295035851
Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Change-Id: I9b8a9dbaf8192bb3758c53501450eb45e2fe8d9c
2024-05-07 05:30:23 +00:00
Pawan Wagh
4795662e6a Merge "Show persistent notification for page-agnostic mode" into main 2024-05-07 02:13:53 +00:00
Pawan Wagh
12ff1e2422 Merge "Make links in dialog text clickable" into main 2024-05-07 02:13:30 +00:00
Pawan Wagh
b98a8acf9b Turn off automatic updates in page-agnostic mode
Update global settings to disable updates in page-agnostic mode

Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Bug: 295035851
Bug: 302391134
Change-Id: I170bb3ffd50a08a1399bffcde23e5f111d9a5a1d
2024-05-06 22:17:30 +00:00
Pawan Wagh
a697fba513 Show persistent notification for page-agnostic mode
When device enters page-agnostic mode using 16KB developer
options, show notification to user using boot receiver and service.
On clicked on notification, show detailed instructions on how to
get back to production mode. Removing OEM carrier unlock allowed
condition.

Bug: 295035851
Bug: 338139755
Bug: 302600682
Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Change-Id: Ib7a57af4c6151d2a8da1ec94130532d10b1679aa
2024-05-06 22:16:27 +00:00
Eric Biggers
790e28c431 Merge changes I20f2330d,Iaca5b20c into main
* changes:
  Remove unused class ShadowKeyStore
  Use KeyProperties.UID_SELF instead of KeyStore.UID_SELF
2024-05-06 17:36:00 +00:00
Kangping Dong
91d5413375 Merge "fix container designation, it should be system_ext" into main 2024-05-06 08:55:06 +00:00
Dennis Shen
d9ec7f2b34 fix container designation, it should be system_ext
Cherry pick of internal aflag fix ag/27165141

Bug: b/338095619
Merged-In: I8ee2fd5fad529da2026af77f969abbf88e636ac3
Change-Id: Icea56b89944afd85b7760265ea8bfe35e3300f13
2024-05-06 14:35:13 +08:00
Oriol Prieto Gascó
14d4df602b Merge "RESTRICT AUTOMERGE Set the container field of aconfig flags" into main 2024-05-03 14:09:48 +00:00
Oriol Prieto Gasco
0a441b2f06 RESTRICT AUTOMERGE
Set the container field of aconfig flags

Test: printflags --format='{package}:{container}:' | grep "::"
Bug: 312769710
Flag: NONE
Change-Id: I4fc69f563ead7206ef48278be4fb4cbcfc9cb1f7
2024-05-03 11:42:26 +00:00
Pawan Wagh
8c85f8b3c3 Merge "Apply OTA from /vendor/boot_otas" into main 2024-05-02 19:28:44 +00:00
Pawan Wagh
7d0d858136 Make links in dialog text clickable
Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Bug: 295035851
Change-Id: I71d4f5cb1e27cd52e6f0c5aaeabc9b3f89520cf1
2024-05-02 18:04:58 +00:00
Pawan Wagh
ed3a48df6a Merge "Updating strings for 16KB developer option" into main 2024-05-01 23:23:32 +00:00
Pawan Wagh
aaa0a3faf5 Updating strings for 16KB developer option
Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Bug: 295035851
Change-Id: Ie70b238985b1ccaf3f8893efa6687629d767729e
2024-05-01 21:16:59 +00:00
Pawan Wagh
4c647972fe Merge "Set 16K dev option as checked by default for 16KB page size" into main 2024-04-30 03:33:54 +00:00
Pawan Wagh
a961dfe289 Apply OTA from /vendor/boot_otas
If BOARD_16K_OTA_MOVE_VENDOR := true is set, OTAs will be present at
/vendor/boot_otas for 16KB developer option. Apply OTA from vendor if
present, otherwise fallback to system OTAs

Test: m, m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Bug: 335022191
Change-Id: I534b354c830de2c90fee76502667d5e4ef5a7714
2024-04-29 22:17:46 +00:00