aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
5 daysRemove the redundant constructor.HEADmastermainAng Li
Since Robolectric dropped K support on April 24, this constructor should be removed. Test: mma Change-Id: I03771c84e264dcfd49c81fcf26f3ff1575547084
2024-03-26Don't use androidx nodeps modulesColin Cross
The androidx nodeps modules were an internal implementation detail, they are being removed. Replace the nodeps dependencies with the non-nodeps versions. Bug: 326265727 Test: builds Change-Id: I0a1b7a160dbfeb4a75e736a0a4ac0c6f92e3605d
2024-03-06Merge Android 14 QPR2 to AOSP mainXin Li
Bug: 319669529 Merged-In: Ia1cb202ec5dedbf85d1327d461186913b1a3003f Change-Id: I5e4ab378829094e0011deecc0fc0457546c0a0b5
2024-01-23Merge Android 24Q1 Release (ab/11220357)temp_319669529Xin Li
Bug: 319669529 Merged-In: Idc432653c373df9c244399cceb29509245123f89 Change-Id: Ia1cb202ec5dedbf85d1327d461186913b1a3003f
2024-01-19Clean up empty jar reference am: c29ad43511Rex Hoffman
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TV/+/2918492 Change-Id: I370f26960cdec7ebbda707b60712b1de95638f8c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-19Clean up empty jar referenceRex Hoffman
Uptesting is moving folks to /external/robolectric from /external/robolectric-shadows We maintain /external/robolectric (keep it in sync with github/google3) and are getting ready to delete /external/robolectric-shadows Removing a dependency on an empty jar Bug: 314757990 Test: CI (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d235bbcc6029a72c6f167c51f8894ef7e774f6be) Merged-In: Iae6ba2867e0d8b3ec55b4357962c5c9c48ff32aa Change-Id: Iae6ba2867e0d8b3ec55b4357962c5c9c48ff32aa
2023-12-21List baseline_filename on modules that are implititly using it am: cc05a7ada6Cole Faust
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TV/+/2886526 Change-Id: I35b5d85e90ceaae918ffc5a71f308dca6aa44e4a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-20List baseline_filename on modules that are implititly using itCole Faust
lintable modules currently pick up files named "lint-baseline.xml" to use as the lint baseline implicitly. This is confusing because you could end up using the baseline files in more modules than intended. Lint also has a feature where it requests you remove unnecessary findings from the baseline file, so something could be necessary for one module, but unnecessary for another that accidentally picked up the baseline. We're removing the implicit detection of the baseline file, which requires all modules using it to list the baseline file explicitly. Bug: 272769514 Test: Presubmits Change-Id: I8e33eea2bf3134ec6f9595bd17f362d22998e900
2023-12-16Starting to reduce visibility in to /external/robolectric-shadows am: b71fb7bc6dRex Hoffman
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TV/+/2877295 Change-Id: Ie2ced9cb184361ff4fc5244abe218e0ea4a5abd4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-15Starting to reduce visibility in to /external/robolectric-shadowsRex Hoffman
Test: CI Bug: 314757990 Change-Id: I88c39c721b58d04509c0006dcc0a425083030ce8
2023-12-14Merge "Uptesting is moving folks to /external/robolectric from ↵Treehugger Robot
/external/robolectric-shadows" into main am: 06c928244e Original change: https://android-review.googlesource.com/c/platform/packages/apps/TV/+/2871781 Change-Id: I540f90be44d8c050a0721c9988a857f9d1ef6ef8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-14Merge "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 We maintain /external/robolectric (keep it in sync with github/google3) and are getting ready to delete /external/robolectric-shadows Alternative deleting this repo is also an option. Bug: 314757990 Test: all tests were failing before and after upgrade. Change-Id: Idd902ccf165fa7f2ec3a9d6bc323b9082d0a5702
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: 2243cd3bc5 -s ours am: ↵Xin Li
fbcdfa9d5a -s ours am: 3b93209ab0 -s ours am skip reason: Merged-In I50fee564698ac08fcbd5af0d0b7267eb4740a09f with SHA-1 374d187388 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/TV/+/2862951 Change-Id: Ib06a9759a36308f723a4397b22acfe99eb8196f2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: 2243cd3bc5 -s ours am: ↵Xin Li
fbcdfa9d5a -s ours am skip reason: Merged-In I50fee564698ac08fcbd5af0d0b7267eb4740a09f with SHA-1 374d187388 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/TV/+/2862951 Change-Id: Iceca77e9dcdfc455a697f79cae79b872d6276a18 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: 2243cd3bc5 -s oursXin Li
am skip reason: Merged-In I50fee564698ac08fcbd5af0d0b7267eb4740a09f with SHA-1 374d187388 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/TV/+/2862951 Change-Id: Id1d3e1446f6767272b0e44f088ae7fd2546f4fff Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08Merge Android 14 QPR1Xin Li
Merged-In: I50fee564698ac08fcbd5af0d0b7267eb4740a09f Bug: 315507370 Change-Id: I96c52c48cacd40052ed1d73bea147acc6ce15cb4
2023-12-08Fix the dependency of TVUnitTests which is a device test and should depend ↵Wei Li
on mockito-target instead of mockito-robolectric-prebuilt. am: df22e58513 am: 374d187388 am: f2fa554da4 Original change: https://android-review.googlesource.com/c/platform/packages/apps/TV/+/2863359 Change-Id: I3e03a7b05489596a848972fba9e3fc31bcef7898 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08Fix the dependency of TVUnitTests which is a device test and should depend ↵Wei Li
on mockito-target instead of mockito-robolectric-prebuilt. am: df22e58513 am: 374d187388 Original change: https://android-review.googlesource.com/c/platform/packages/apps/TV/+/2863359 Change-Id: I89f41a135b519df8077666ef94d91345ca855295 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08Fix the dependency of TVUnitTests which is a device test and should depend ↵tmp_amf_315507370Wei Li
on mockito-target instead of mockito-robolectric-prebuilt. am: df22e58513 Original change: https://android-review.googlesource.com/c/platform/packages/apps/TV/+/2863359 Change-Id: I50fee564698ac08fcbd5af0d0b7267eb4740a09f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08Fix the dependency of TVUnitTests which is a device test and should depend ↵Wei Li
on mockito-target instead of mockito-robolectric-prebuilt. See the bug for more details. Bug: 309878241 Test: acloud create --build-target cf_x86_tv_gtv-trunk_staging-userdebug && atest TVUnitTests Change-Id: Iad01967330fea74d537cd260b8e9e3bf492c1577
2023-12-06Merge "mk2bp conversion for TvRoboTests and TvTunerRoboTests" into main am: ↵Wei Li
020295edbf am: ef75801ae9 am: 7d1e779d2f Original change: https://android-review.googlesource.com/c/platform/packages/apps/TV/+/2822172 Change-Id: I144f978866ffd436e298216187f30b96d168114f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06Merge "mk2bp conversion of TV" into main am: 0230f43caf am: 9c16f02018 am: ↵Wei Li
308980bd7e Original change: https://android-review.googlesource.com/c/platform/packages/apps/TV/+/2826213 Change-Id: Id0a860ceaa6ca2687be3498da10957e8f336dd39 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06Merge "mk2bp conversion for TvRoboTests and TvTunerRoboTests" into main am: ↵Wei Li
020295edbf am: ef75801ae9 Original change: https://android-review.googlesource.com/c/platform/packages/apps/TV/+/2822172 Change-Id: I72741bc5ebe5b8a18f259e160bee80d189872feb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06Merge "mk2bp conversion for TvRoboTests and TvTunerRoboTests" into main am: ↵Wei Li
020295edbf am: c1b3696d60 am: 7d4a5b540f Original change: https://android-review.googlesource.com/c/platform/packages/apps/TV/+/2822172 Change-Id: I6ecfc14f25582635e36c4b315e0811b51aaddb50 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06Merge "mk2bp conversion of TV" into main am: 0230f43caf am: 9c16f02018Wei Li
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TV/+/2826213 Change-Id: Ifc0f47d7e55223a4e99405ce386c36611ec9d0f6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06Merge "mk2bp conversion of TV" into main am: 0230f43caf am: 509c3eb0fd am: ↵Wei Li
548c35d53c Original change: https://android-review.googlesource.com/c/platform/packages/apps/TV/+/2826213 Change-Id: I1f7d6df3b81d632c68b12743e34f53457a00c154 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06Merge "mk2bp conversion for TvRoboTests and TvTunerRoboTests" into main am: ↵Wei Li
020295edbf am: c1b3696d60 Original change: https://android-review.googlesource.com/c/platform/packages/apps/TV/+/2822172 Change-Id: I9016fc122965e9a1d39536673bbd56e1351c2ccd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06Merge "mk2bp conversion of TV" into main am: 0230f43caf am: 509c3eb0fdWei Li
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TV/+/2826213 Change-Id: I60d20ea774346de634ec62e7a24e7914e4fb6173 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06Merge "mk2bp conversion for TvRoboTests and TvTunerRoboTests" into main am: ↵Wei Li
020295edbf Original change: https://android-review.googlesource.com/c/platform/packages/apps/TV/+/2822172 Change-Id: I771c1e0b8961314d4dff4ce8be50994bbbb355ff Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06Merge "mk2bp conversion for TvRoboTests and TvTunerRoboTests" into main am: ↵Wei Li
020295edbf Original change: https://android-review.googlesource.com/c/platform/packages/apps/TV/+/2822172 Change-Id: I775469ffef3b4cd5e09d20904f0c49991ab17f80 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06Merge "mk2bp conversion of TV" into main am: 0230f43cafWei Li
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TV/+/2826213 Change-Id: I03428f2177acaefe0bcef9e3f5bb2399b2fb9a32 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06Merge "mk2bp conversion of TV" into main am: 0230f43cafWei Li
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TV/+/2826213 Change-Id: Ib3b87c5851c25da23ec2e4fa0c16ff1dc6b79eb8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06Merge "mk2bp conversion for TvRoboTests and TvTunerRoboTests" into mainWei Li
2023-12-06Merge "mk2bp conversion of TV" into mainWei Li
2023-12-01mk2bp conversion for TvRoboTests and TvTunerRoboTestsJim Tang
Bug: 309878241 Test: atest TvRoboTests TvTunerRoboTests TvCommonRoboTests Change-Id: Ia26ef71f80abbab5d0a3b1b1e3f4e76d16313d7e
2023-12-01mk2bp conversion of TVJim Tang
This commit does not include conversion of robolectric tests. Bug: 309878241 Test: m tv-test-common-robo Test: atest TVUnitTests --start-avd Change-Id: I9f75590c9de36b9f1893a49f7dffba03eb574225
2023-11-28Check DvrScheduleManager null status am: e64c0d53a4 am: 51238c71ae am: ↵Venkatarama Avadhani
4c15a45ece Original change: https://android-review.googlesource.com/c/platform/packages/apps/TV/+/2829417 Change-Id: I47321bfeb273720967954db2d065264ff6a802a1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28Check DvrScheduleManager null status am: e64c0d53a4 am: f3449bcdd4 am: ↵Venkatarama Avadhani
279537cff5 Original change: https://android-review.googlesource.com/c/platform/packages/apps/TV/+/2829417 Change-Id: Ie202a4e78a39db13670e66d93696bd11de2ec3d5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28Check DvrScheduleManager null status am: e64c0d53a4 am: 51238c71aeVenkatarama Avadhani
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TV/+/2829417 Change-Id: I95182e4a8be9c13154c14f79b3731caf61ce59a1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28Check DvrScheduleManager null status am: e64c0d53a4 am: f3449bcdd4Venkatarama Avadhani
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TV/+/2829417 Change-Id: I7816e7bd0536d5527d7cd8581ada831ec0cf00ba Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28Check DvrScheduleManager null status am: e64c0d53a4Venkatarama Avadhani
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TV/+/2829417 Change-Id: I5d9d26e462a80b3a9efcf55b98ab6b831ef21463 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28Check DvrScheduleManager null status am: e64c0d53a4Venkatarama Avadhani
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TV/+/2829417 Change-Id: I8af236d18dff0cc8afb45e6b02a99a7813c48c2f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-14Check DvrScheduleManager null statusVenkatarama Avadhani
When there is a get operation for DvrManager in TvApplication, check that the DvrScheduleManager is already assigned and not null before attempting the constructor call to DvrManager. The DvrManager constructor requires the DvrScheduleManager object to be not null. Bug: 298929825 Test: Build Change-Id: I04e63b2ca6e7e701ece7fa391516f203e79ba36b
2023-11-09Convert Android.mk of tv-tunner-testing to Android.bp am: 206f12c97d am: ↵morrislin
d289729f7d am: 4c677f3fbd Original change: https://android-review.googlesource.com/c/platform/packages/apps/TV/+/2819300 Change-Id: I10376c57bf9fdb1d6316607f5e7c972c906b511b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09Convert Android.mk of tv-tunner-testing to Android.bp am: 206f12c97d am: ↵morrislin
625f41635b am: 1844493ee7 Original change: https://android-review.googlesource.com/c/platform/packages/apps/TV/+/2819300 Change-Id: Id8c09a745d33272f58151cc0637735b4244c13c8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09Convert Android.mk of tv-tunner-testing to Android.bp am: 206f12c97d am: ↵morrislin
d289729f7d Original change: https://android-review.googlesource.com/c/platform/packages/apps/TV/+/2819300 Change-Id: I16a914d57602c5efad1d84a74d6bfb6c76d7016d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09Convert Android.mk of tv-tunner-testing to Android.bp am: 206f12c97d am: ↵morrislin
625f41635b Original change: https://android-review.googlesource.com/c/platform/packages/apps/TV/+/2819300 Change-Id: If2af632964fad7e58e94de621380d892f45ca9c8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09Convert Android.mk of tv-tunner-testing to Android.bp am: 206f12c97dmorrislin
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TV/+/2819300 Change-Id: I50d5ab4c8df95cf9f57eb373ad430599b169d510 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-09Convert Android.mk of tv-tunner-testing to Android.bp am: 206f12c97dmorrislin
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TV/+/2819300 Change-Id: If5b0addf3b05502601a1618fa1373ed94b0a4b25 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 11:45:05 +0000