Commit Graph

17118 Commits

Author SHA1 Message Date
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
Eric Biggers
f56ead496e Remove unused class ShadowKeyStore
Since the class android.security.KeyStore is going away, remove the
unused test utility class ShadowKeyStore that references it.

(ShadowKeyStore was originally used by a test, but
https://r.android.com/1353609 deleted that test.)

Bug: 326508120
Test: build
Flag: TEST_ONLY
Change-Id: I20f2330dee171a0bfe860a1318dc2f962a80bd19
2024-04-25 19:46:54 +00:00
Jeff DeCew
1d4d5343cc Remove redundant call to SetFlagsRule.initAllFlagsToReleaseConfigDefault()
Change-Id: I1b628f9430cfdd4b1c12deb7e8f4345658f05ca8
Test: atest
Bug: 336802415
Flag: none
2024-04-24 16:56:31 +00:00
Jakub Rotkiewicz
c923103142 Bluetooth Codec Settings: Assure flag enabled
Assure flag a2dpOffloadCodecExtensibilitySettings is enabled before
calling BluetoothA2dp API.

Bug: 331612641
Tag: #feature
Test: atest SettingsRoboTests:com.android.settings.development.bluetooth.AbstractBluetoothListPreferenceController
Test: atest SettingsRoboTests:com.android.settings.development.bluetooth.BluetoothCodecListPreferenceControllerTest
Merged-In: Iac33a6c95a544230e034807b320c80a727ade307
Change-Id: I2b0ed6c7ac91401b958b206817aca55e0aa47170
2024-04-16 06:08:46 +00:00
Jakub Rotkiewicz
de27acef86 Refactor Bluetooth Codec settings to dynamic ListPreference
Fetch supported codecs from native and present to user using
ListPreference.

Bug: 305779598
Bug: 311451118
Bug: 323319530
Tag: #feature
Test: atest SettingsRoboTests:com.android.settings.development.bluetooth.AbstractBluetoothListPreferenceController
Test: atest SettingsRoboTests:com.android.settings.development.bluetooth.BluetoothCodecListPreferenceControllerTest

Merged-In: Iedbfd01c0d1b59df8a073f4e9aedca3913e6d45f
Change-Id: I90ed0d83c3250c64789e27707b0b7bff30043335
2024-03-21 11:06:18 +00:00
Aditya Choudhary
3f65505208 [DON'T BLOCK] Test ownership migration rules
This CL is created as a best effort to migrate test targets
to the new android ownership model. If you find incorrect or unnecessary
attribution in this CL, please create a separate CL to fix that.

For more details please refer to the link below,
go/new-android-ownership-model

Bug: 304529413
Test: N/A
Change-Id: I7fbd55a92f4302a6e03bcff0283737fd9295165d
2024-02-09 16:14:48 +00:00
Xin Li
6b4b7336bc Merge Android 24Q1 Release (ab/11220357)
Bug: 319669529
Merged-In: If21ca5e914a5ee5aff3fbeeee9595bb77a8fc3d0
Change-Id: I87182e72d0ceb75499528f9011d009d772045e09
2024-01-30 09:24:25 -08:00
Chris Antol
d06d6affb4 Merge "Prevent the disabling of specified apps" into main 2024-01-16 17:27:43 +00:00
Edward Savage-Jones
49a60a152a Prevent the disabling of specified apps
Prevent the disabling of specified apps, avoiding cases
where disabling the app may result in an unusable system.

Bug: 200043113
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ApplicationFeatureProviderImplTest

Change-Id: I0b298af76cec20e4f31ec7411bbf3200a2869035
Merged-In: I0b298af76cec20e4f31ec7411bbf3200a2869035
2024-01-12 18:55:41 +00:00
Pawan Wagh
008842edeb Call update engine to apply payload
Calling update engine to apply payload provided from boot_otas and
reboot on success. Updating different dialogues for 4k prompt.

Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk
Test: make RunSettingsRoboTests ROBOTEST_FILTER=Enable16kPagesPreferenceControllerTest
Bug: 295573133
Change-Id: Iab90a2c2fae5f6aefce95b2306db91c7b056d9f7
2024-01-12 17:13:31 +00:00
Jason Chiu
706907b7b2 Finish HomepageActivity when it's not the root of a task and not singleTask.
HomepageActivity should be the first activity in a task, or be launched
in singleTask mode. Finishing it will bring up the previous activity in
the task.

Fix: 297857732
Fix: 309045575
Test: robotest
Change-Id: Iddcba1652060d755693dd20d0e350e3d6c1ae138
Merged-In: Iddcba1652060d755693dd20d0e350e3d6c1ae138
2023-12-26 02:08:14 +00:00
Manish Singh
aff8a7d231 Fix postsubmit test failures
Test: atest ProfileSelectFragmentTest
Bug: 314371622
Change-Id: Id31518fb92491e5a434cc4a3a95b6353d58a382f
2023-12-14 08:31:14 +00:00
Yiyi Shen
bf6e273ccb [Audiosharing] Update the media device based on assistant callback
Bug: 305620450
Test: atest AvailableMediaDeviceGroupControllerTest
Change-Id: I7a19edb4e408c59ead553ec10fd9e963674518a6
2023-12-13 18:16:55 +08:00
Yiyi Shen
a51097d008 Merge "[Audiosharing] Add prefix to device list item text in adapter." into main 2023-12-12 05:36:54 +00:00
Yiyi Shen
f3e693d7a5 Merge "[Audiosharing] Fix test." into main 2023-12-12 05:35:44 +00:00
Yiyi Shen
bdb66db5f3 [Audiosharing] Fix test.
https://android-build.corp.google.com/test_investigate/?invocationId=I15800010225964211&testResultId=TR05829086064241708

Test: make RunSettingsRoboTests2 -j40
Bug: 305620450
Change-Id: Ia93cd0dc0c9959d8ab078b29023936b21c7a0e08
2023-12-12 11:44:58 +08:00
Fan Wu
dd61b6bb3d Merge "Fix BluetoothUpdateWorkerTest." into main 2023-12-12 01:16:22 +00:00
FanWu
e6d648aa40 Fix BluetoothUpdateWorkerTest.
Should avoid spying on Android classes due to potential test pollution: https://robolectric.org/best-practices/

Bug: 315399487

Test: atest SettingsRoboTests:com.android.settings.homepage.contextualcards.slices --iterations 20
Change-Id: Ia52baf52bf43d3a3959dc0234fbfc5b4a4575dac
2023-12-11 10:23:09 +00:00
mxyyiyi
a919306d75 Provide foreground_service usage time in BatteryDiffEntry.
- Fetch foreground service info through new api from UidBatteryConsumer.
- Record fgs & bg usage time separately, combine them till ui display.

Bug: 315255868
Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.fuelgauge.*"
Change-Id: Ic19844db7908a6ae6522c7a72972f44f94dcfca4
2023-12-11 15:57:10 +08:00
Joshua Mccloskey
4ed5548887 Merge "Fixed biometric setting crash." into main 2023-12-08 20:22:59 +00:00
Yiyi Shen
ab3136a51d [Audiosharing] Add prefix to device list item text in adapter.
Bug: 305620450
Test: atest
Change-Id: Icd8f7032d9bcf1be133d6b3f4c165ca98e0dfa60
2023-12-08 17:07:34 +08:00
Yiyi Shen
79028d1c8f Merge "[Audiosharing] Refine sharing disconnect dialog." into main 2023-12-08 08:24:07 +00:00
Yiyi Shen
90844f3546 Merge "[Audiosharing] Refine sharing stop dialog." into main 2023-12-08 08:23:39 +00:00
Yiyi Shen
f8ccd2bda3 Merge "[Audiosharing] Refine main sharing dialog." into main 2023-12-08 08:13:24 +00:00
Yiyi Shen
4d130705c7 [Audiosharing] Refine sharing stop dialog.
Bug: 305620450
Test: atest AudioSharingStopDialogFragmentTest
Change-Id: I1593d1b18af23ffea0ccae0425ad848191b90e8b
2023-12-08 07:17:57 +00:00
Yiyi Shen
13d09c97b2 [Audiosharing] Refine main sharing dialog.
Bug: 305620450
Test: atest AudioSharingDialogFragmentTest
Change-Id: Icd9d7524b29bc3a37f27316107176b93510cc12c
2023-12-08 14:54:41 +08:00
Yiyi Shen
16b78546a1 [Audiosharing] Refine sharing disconnect dialog.
Bug: 305620450
Test: atest AudioSharingDisconnectDialogFragmentTest
Change-Id: I16507fc5424fcb4bfa977199e92f9728c5df69c6
2023-12-08 14:27:36 +08:00
Yiyi Shen
eeec2a708c Merge "[Audiosharing] Refine sharing join dialog." into main 2023-12-08 06:19:35 +00:00
Yiyi Shen
fb617e423e [Audiosharing] Refine sharing join dialog.
Bug: 305620450
Test: atest AudioSharingJoinDialogFragmentTest
Change-Id: I54001d254d5cfd0cd72ea1a115d71142b6e6ed47
2023-12-08 13:14:23 +08:00
Treehugger Robot
961f299c4c Merge "Ignore failing test of BluetoothUpdateWorkerTest" into main 2023-12-08 04:10:14 +00:00
Yanting Yang
033263b858 Ignore failing test of BluetoothUpdateWorkerTest
Bug: 315399487
Test: post-submit
Change-Id: I2747b45e60b7aa4d1326e8eb01bc2af8e8666030
2023-12-08 03:11:01 +00:00
Joshua McCloskey
a900c1dd1b Fixed biometric setting crash.
Test: Verified test crashed without fix, and passed with fix
Test: atest FingerprintSettingsFragmentTest
Fixes: 315164185
Change-Id: I1d8ab32eef8578a6d35831aef46275a9732e497c
2023-12-07 22:12:44 +00:00
Manish Singh
62702e3c47 Merge "Make the order of tabs same as profile creation" into main 2023-12-07 13:26:19 +00:00
Yanting Yang
1bae4c830e Merge "Ignore failing tests of com.android.settings.deviceinfo.batteryinfo" into main 2023-12-07 12:53:04 +00:00
Anubhav Kakkar
86b5a0afc1 Merge "Implement special app access settings for MEDIA_ROUTING_CONTROL app-op." into main 2023-12-07 10:58:40 +00:00
Yanting Yang
5aff1ee1cd Merge "Revert^2 "Ignore failing test cases in BatterTipsCardPreferenceTest"" into main 2023-12-07 09:12:42 +00:00
Anubhav Kakkar
642bc5a6bc Implement special app access settings for MEDIA_ROUTING_CONTROL app-op.
Bug: b/307632045
Test: Pair a watch with companion app > Settings > Apps > Special app access > enter "Change Media Output" > Find the companion app > Ensure the special app access is Allowed > ensure companion app is able to call remote media routing APIs > come back to the settings > revoke the access > ensure that now companion app is NOT able to call the remote media routing APIs.

Change-Id: I35487660365ef05f3b998e8ecf13aaed7ba844a9
2023-12-07 09:12:08 +00:00
Yanting Yang
53fa7d2891 Ignore failing tests of com.android.settings.deviceinfo.batteryinfo
Bug: 315267179
Test: post-submit
Change-Id: Ib209068325e4716026e4a9894f5e79ca15855aea
2023-12-07 09:10:37 +00:00
Fan Wu
22a1d4757a Revert^2 "Ignore failing test cases in BatterTipsCardPreferenceTest"
This reverts commit a8cc8c10de.

Reason for revert:
These tests are still failing: https://android-build.corp.google.com/test_investigate/?invocationId=I09000010224426738&testResultId=TR72029080085366662

Change-Id: I1ffac500a4dc411aa8ab03ab76b02e217b7d43de
2023-12-07 05:37:57 +00:00
Yanting Yang
432c6e36a6 Merge "Ignore failing tests of AppInfoWithHeaderTest" into main 2023-12-07 03:52:42 +00:00
Yanting Yang
90c953cafd Merge "Ignore failing tests of com.android.settings.widget" into main 2023-12-07 03:52:37 +00:00
Yanting Yang
f50413d80a Merge "Ignore failing tests of WifiDialogActivityTest" into main 2023-12-07 03:52:33 +00:00
Treehugger Robot
e836500615 Merge "Ignore failing tests of com.android.settings.wallpaper" into main 2023-12-07 01:45:16 +00:00
Joseph Vincent
85f0c65554 Merge "Show customized message for private space lock setup screen" into main 2023-12-06 23:21:36 +00:00
josephpv
2d7985fbf3 Show customized message for private space lock setup screen
go/ss/3kmkEkasv6vmDDo.png
go/ss/7CzzSXZthbJVcEr.png

Bug: 308862923
Test: atest ChooseLockGenericTest and Verified manually customized
message is shown when passed with intent.

Change-Id: I784d42c4702801ec45bc8d4c5e911a404f549d46
2023-12-06 20:39:51 +00:00
Daniel Norman
0fa75c4e41 Merge "Adds a summary to the (screen) Magnification preference for the main A11y Settings page." into main 2023-12-06 20:22:28 +00:00
Daniel Norman
2edaf7668c Merge changes from topic "b-303511250-cleanup" into main
* changes:
  Use A11yManagerService to check if the A11yService warning is required.
  Minor refactoring to replace duplicated logic with existing methods.
2023-12-06 19:55:21 +00:00
Yanting Yang
29d290b845 Ignore failing tests of AppInfoWithHeaderTest
Bug: 315135755
Test: atest
Change-Id: I6bd971cf23692e74eea67b8d57d79099eeb8c452
2023-12-06 15:46:14 +00:00
Yanting Yang
445a8d12db Ignore failing tests of com.android.settings.widget
Bug: 315133235
Test: post-submit
Change-Id: I16c17ff659192c80aa0eb6ee10df82938fa97daf
2023-12-06 15:30:21 +00:00
Yanting Yang
09e32b466b Ignore failing tests of WifiDialogActivityTest
Bug: 314867581
Test: post-submit
Change-Id: Ie0027de0a81e209a6db10a6075a92e680b1c1206
2023-12-06 15:14:02 +00:00