aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-12-14Snap for 11216811 from 2036074bd6aad3d80a43da0fd4506e2844b0194e to 24Q1-releaseandroid-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseAndroid Build Coastguard Worker
Change-Id: I44c4026385526926d829cac544452585d7fd1b79
2023-12-13Merge "Uptesting is moving folks to /external/robolectric from ↵Treehugger Robot
/external/robolectric-shadows" into main am: 9c0bb0dc59 am: 1966a44833 am: 69c57c8d04 Original change: https://android-review.googlesource.com/c/platform/external/robolectric/+/2871682 Change-Id: I7d01725a70c7e998131197c8bc8c5d9dabee36b0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-13Merge "Uptesting is moving folks to /external/robolectric from ↵Treehugger Robot
/external/robolectric-shadows" into main am: 9c0bb0dc59 am: 1966a44833 Original change: https://android-review.googlesource.com/c/platform/external/robolectric/+/2871682 Change-Id: Id0473c16a52d6e4b9488927a34c6287cadd8d3ca Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-13Merge "Uptesting is moving folks to /external/robolectric from ↵Treehugger Robot
/external/robolectric-shadows" into main am: 9c0bb0dc59 Original change: https://android-review.googlesource.com/c/platform/external/robolectric/+/2871682 Change-Id: I5f9b6fd59a5a0ff495f2b7bf3697ec47d9bdf666 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-13Merge "Uptesting is moving folks to /external/robolectric from ↵Treehugger Robot
/external/robolectric-shadows" into main
2023-12-13Uptesting is moving folks to /external/robolectric from ↵Rex Hoffman
/external/robolectric-shadows Needed for new android.bp files that used to be make files. Bug: 314757990 Test: CI Change-Id: I6b40e6aae7e29da4d1e615c1504040d4b4bc6b24
2023-12-12Snap for 11206181 from 2ba0f6e2b5cc00fe6f34a398b9d619fde2834f7c to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: Ia2900e60005f929315bd30f48be6b8ba21314ee5
2023-12-11[automerger skipped] Merge "Merge Android 14 QPR1" into main am: ec237983ce ↵Xin Li
-s ours am: 4ef109fcc4 -s ours am: be2c5d0cc9 -s ours am skip reason: Merged-In If325c419ef92cd97af7fdba201e29f8b78636c5d with SHA-1 9bc68f90ba is already in history Original change: https://android-review.googlesource.com/c/platform/external/robolectric/+/2863530 Change-Id: Idb1c048c5fc30efdf744da91108473d160c746b5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: 849dc7e2fb -s ours am: ↵Xin Li
64865dcda6 -s ours am: 70e7414333 -s ours am skip reason: Merged-In If325c419ef92cd97af7fdba201e29f8b78636c5d with SHA-1 9bc68f90ba is already in history Original change: https://android-review.googlesource.com/c/platform/external/robolectric/+/2863530 Change-Id: Iffaa0ae16c03c21868f5fec109d9fcff240cab41 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge "Merge Android 14 QPR1" into main am: ec237983ce ↵Xin Li
-s ours am: 4ef109fcc4 -s ours am skip reason: Merged-In If325c419ef92cd97af7fdba201e29f8b78636c5d with SHA-1 9bc68f90ba is already in history Original change: https://android-review.googlesource.com/c/platform/external/robolectric/+/2863530 Change-Id: I5947612da86dc24d2b50a700342a2534095ec6c9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: 849dc7e2fb -s ours am: ↵Xin Li
64865dcda6 -s ours am skip reason: Merged-In If325c419ef92cd97af7fdba201e29f8b78636c5d with SHA-1 9bc68f90ba is already in history Original change: https://android-review.googlesource.com/c/platform/external/robolectric/+/2863530 Change-Id: I1676be871492522a9843f3acd84ad17c7b06b1af Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge "Merge Android 14 QPR1" into main am: ec237983ce ↵Xin Li
-s ours am skip reason: Merged-In If325c419ef92cd97af7fdba201e29f8b78636c5d with SHA-1 9bc68f90ba is already in history Original change: https://android-review.googlesource.com/c/platform/external/robolectric/+/2863530 Change-Id: I2d42aecbf52a9e7b912fc768ec14b7dd0b197ffc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: 849dc7e2fb -s oursXin Li
am skip reason: Merged-In If325c419ef92cd97af7fdba201e29f8b78636c5d with SHA-1 9bc68f90ba is already in history Original change: https://android-review.googlesource.com/c/platform/external/robolectric/+/2863530 Change-Id: Ied85cdbe39dc5c27ae8a1835accef3117187f3f5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11Merge "Adding settings screenshot to be visible" into mainJoshua Mccloskey
2023-12-09Merge "Merge Android 14 QPR1" into mainXin Li
2023-12-08Merge Android 14 QPR1Xin Li
Merged-In: If325c419ef92cd97af7fdba201e29f8b78636c5d Bug: 315507370 Change-Id: I0ad3f77a2715229568617d916e38715393fc754d
2023-12-07Snap for 11186783 from bc0ebb3c5c54448d2777635216875b62735a7186 to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: I3c69a154a52cfaf7897adeb4658f4f4389b93f46
2023-12-06Merge "Add DeviceLock server unit tests to robolectric visibility" into main ↵Kevin Han
am: 31d7029472 am: a3f1e31b1a am: d9b570813e Original change: https://android-review.googlesource.com/c/platform/external/robolectric/+/2860166 Change-Id: Ie0bdd324f1ac8a0137a054d534e37aa41cd2cce3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06Merge "Add DeviceLock server unit tests to robolectric visibility" into main ↵Kevin Han
am: 31d7029472 am: a3f1e31b1a Original change: https://android-review.googlesource.com/c/platform/external/robolectric/+/2860166 Change-Id: I8c9bac1a957efef1b06e1a84cbbe045da74dd348 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06Merge "Add DeviceLock server unit tests to robolectric visibility" into main ↵Kevin Han
am: 31d7029472 am: 9bc68f90ba am: 85e3af0d49 Original change: https://android-review.googlesource.com/c/platform/external/robolectric/+/2860166 Change-Id: I1c69935a302ee81630252c4b6571c15d126009dd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06Merge "Add DeviceLock server unit tests to robolectric visibility" into main ↵Kevin Han
am: 31d7029472 am: 9bc68f90ba Original change: https://android-review.googlesource.com/c/platform/external/robolectric/+/2860166 Change-Id: I37e07ce226ed63647215e03c8fe52987a87ba4c2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06Merge "Add DeviceLock server unit tests to robolectric visibility" into main ↵Kevin Han
am: 31d7029472 Original change: https://android-review.googlesource.com/c/platform/external/robolectric/+/2860166 Change-Id: Iec23c435794fde4531260dde706f287964c9e6db Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06Merge "Add DeviceLock server unit tests to robolectric visibility" into main ↵tmp_amf_315507370Kevin Han
am: 31d7029472 Original change: https://android-review.googlesource.com/c/platform/external/robolectric/+/2860166 Change-Id: If325c419ef92cd97af7fdba201e29f8b78636c5d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06Merge "Add DeviceLock server unit tests to robolectric visibility" into mainKevin Han
2023-12-06Add DeviceLock server unit tests to robolectric visibilityKevin Han
Add the DeviceLock server side unit tests to the list of packages that can use robolectric. Bug: 312521897 Test: atest DeviceLockUnitTests (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ba5d2099abda78c8201e281547520dc1856c83c5) Change-Id: I8500c2334a4cec950fbd3f83064b4f451cd5c79b
2023-12-05Merge "Adding settings screenshot to be visible" into main am: ccc3f78c31 ↵Joshua Mccloskey
am: 691553ad26 am: 3cde15122d Original change: https://android-review.googlesource.com/c/platform/external/robolectric/+/2860468 Change-Id: I92aefada5bc04590e4fd13e4fdbf6e9ce28cd3f7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05Merge "Adding settings screenshot to be visible" into main am: ccc3f78c31 ↵Joshua Mccloskey
am: 68ae4dfafb am: 35be5d875b Original change: https://android-review.googlesource.com/c/platform/external/robolectric/+/2860468 Change-Id: Iec17cf3839ad66d26a55fc58aa05b3b1ed88721a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05Merge "Adding settings screenshot to be visible" into main am: ccc3f78c31 ↵Joshua Mccloskey
am: 691553ad26 Original change: https://android-review.googlesource.com/c/platform/external/robolectric/+/2860468 Change-Id: I78f465a61d8d913fc8e1176289b973fe966bf050 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05Merge "Adding settings screenshot to be visible" into main am: ccc3f78c31 ↵Joshua Mccloskey
am: 68ae4dfafb Original change: https://android-review.googlesource.com/c/platform/external/robolectric/+/2860468 Change-Id: Ib3cbbb7abf6ab47f8e928adafdc60ec403fcc84f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05Merge "Adding settings screenshot to be visible" into main am: ccc3f78c31Joshua Mccloskey
Original change: https://android-review.googlesource.com/c/platform/external/robolectric/+/2860468 Change-Id: Iec9911bf0c4777b74870338480c9e79c1ff79395 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05Merge "Adding settings screenshot to be visible" into main am: ccc3f78c31Joshua Mccloskey
Original change: https://android-review.googlesource.com/c/platform/external/robolectric/+/2860468 Change-Id: I15a65e46e6687c117d47bdda7333dcdeba9b1b64 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05Adding settings screenshot to be visibleJoshua McCloskey
Test: atest Change-Id: Iba58d333a112bef6a463df0008438e4bcd582dfa Merged-In: I578054bdf20abcfdbcc586016681a7ebfec0783e
2023-12-05Merge "Adding settings screenshot to be visible" into mainJoshua Mccloskey
2023-12-05Adding settings screenshot to be visibleJoshua McCloskey
Test: atest Change-Id: I578054bdf20abcfdbcc586016681a7ebfec0783e
2023-11-30Snap for 11157599 from cf13ad38f7ea2faa7ccba3681188d4b252cd17a1 to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: I02a9eccc602d3d6fb58b89689546b56c0f6e4bac
2023-11-29Merge "Merge branch 'upstream-google' into convert_iso_keyboard" into main ↵Ang Li
am: 820cd4e375 am: 6f607c9cbc am: 5aa97a99ee Original change: https://android-review.googlesource.com/c/platform/external/robolectric/+/2849943 Change-Id: I2dfeb1c886d9cc0e0a8cefc977d97653d2fb81dc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29Merge "Merge branch 'upstream-google' into convert_iso_keyboard" into main ↵Ang Li
am: 820cd4e375 am: 600d1c3045 am: 61cf8bade7 Original change: https://android-review.googlesource.com/c/platform/external/robolectric/+/2849943 Change-Id: I1ecfa8af1fc304d76249eb3999642650edea3d97 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29Merge "Merge branch 'upstream-google' into convert_iso_keyboard" into main ↵Ang Li
am: 820cd4e375 am: 6f607c9cbc Original change: https://android-review.googlesource.com/c/platform/external/robolectric/+/2849943 Change-Id: I4264b98f74ffc015a6d6b703d90f5cf2085de5e4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29Merge "Merge branch 'upstream-google' into convert_iso_keyboard" into main ↵Ang Li
am: 820cd4e375 am: 600d1c3045 Original change: https://android-review.googlesource.com/c/platform/external/robolectric/+/2849943 Change-Id: Iecaa9dd9735d93cee584736de12bdd7939e7c668 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29Merge "Merge branch 'upstream-google' into convert_iso_keyboard" into main ↵Ang Li
am: 820cd4e375 Original change: https://android-review.googlesource.com/c/platform/external/robolectric/+/2849943 Change-Id: Icc5f20bb61a166fc12c86ee0320be23ecf7377bf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29Merge "Merge branch 'upstream-google' into convert_iso_keyboard" into main ↵Ang Li
am: 820cd4e375 Original change: https://android-review.googlesource.com/c/platform/external/robolectric/+/2849943 Change-Id: Ic94f949f7fc4a7639a20e341c26c3314b4c3723e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29Merge "Merge branch 'upstream-google' into convert_iso_keyboard" into mainAng Li
2023-11-29Merge branch 'upstream-google' into convert_iso_keyboardAng Li
Change-Id: I3b461f268555bfd37fe8bb135e097b967d70ad17
2023-11-28Fill in the missing keys in `ShadowKeyCharacterMap`.Googler
Currently there are missing keys and key correspondence in `ShadowKeyCharacterMap`. This CL fills the gap between this key character map with a real ISO keyboard. PiperOrigin-RevId: 586214792
2023-11-28Add support for isLeAudioSupported()Googler
This CL adds support for isLeAudioSupported() method in BluetoothAdapter. If the original bluetooth adapter is used in unit tests, then to verify if Le Audio is supported or not, it depends on the bluetooth service and tests fail as there is no control on bluetooth service in test files. Adding setter and getter functions for Le Audio in ShadowBluetoothAdapter helps to overcome this issue. PiperOrigin-RevId: 586185847
2023-11-28Fix ShadowTelecomManager to accept nullable phone accountGoogler
It's valid to have a nullable PhoneAccount. It is handled inside the PhoneAccountRegistrar.java in the production code. PiperOrigin-RevId: 585910619
2023-11-27Add support for getMostRecentlyConnectedDevices()Googler
This CL adds support for getMostRecentlyConnectedDevices() method in BluetoothAdapter. This will facilitate the testing of the code dependent on this API to fetch a list of the most recently connected bluetooth devices ordered by how recently they were connected with most recently first and least recently last. PiperOrigin-RevId: 585819319
2023-11-27Begin to remove support for legacy resources.Brett Chabot
Legacy resource mode has been deprecated for several years and was not supported when using android versions P and above. In the Robolectric 4.11 release robolectric was changed to always prefer binary resources mode. This commit removes support for specifying legacy resources mode at all. Future changes will remove more obsolete code that deals with legacy resources. PiperOrigin-RevId: 585741360
2023-11-27Remove obsolete targetSdkVersion=O handling.Brett Chabot
Robolectric's AndroidManifest parser has now long obsolete logic that interpret targetSdkVersion=O as 26. This commit removes that logic. PiperOrigin-RevId: 585739314
2023-11-27Add warning message when AndroidManifest cannot be found.Brett Chabot
Users using the Android Gradle Plugin currently need to specify testOptions.unitTests.includeAndroidResources = true for Robolectric to have access to AndroidManifest and other Android resources. Without this config setting, users may see cryptic errors at runtime like "Unable to resolve activity for Intent " when launching an Activity. This commit adds an additional console message when AndroidManifest cannot be found, to instruct that AGP users may want to add the includeAndroidResources config option. PiperOrigin-RevId: 585734701
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-29 13:44:30 +0000