aboutsummaryrefslogtreecommitdiff
path: root/tests
AgeCommit message (Collapse)Author
2017-10-04Sync to match Live Channels 1.15(ncis)oreo-mr1-devNick Chalko
aka ub-tv-dev at a73a150bb7d0d1ce867ef980c6ac8411899d40ad Bug: 64021596 Change-Id: I7c544fd15e2c58784f8babc31877ad0dfeebb4c0 (cherry picked from commit 633eb826b8c97731dfc5ef12c7bf78a63734275d)
2017-06-15Fix dependencies of packages that target earlier releases am: 7416628255Paul Duffin
am: 33704b7c1e Change-Id: I9750cfd7d7233cd841cef6bbf66b97c6f89538c0
2017-06-13Fix dependencies of packages that target earlier releasesandroid-o-preview-4android-o-iot-preview-5o-iot-preview-5Paul Duffin
A previous change added legacy-android-test as a static dependency to all packages that build against the current, test_current or system_current and failed to compile when the junit and android.test classes were removed from the API. Unfortunately, those changes did not take into account that some of those packages target earlier API versions and so will always have the classes available at runtime. This change replaces those static dependencies with dynamic dependencies for any package that targets an earlier API version. The file changes were made automatically by a tool that constructed and then analyzed a full dependency graph of all the Android Java modules. The individual changes were checked manually to ensure that the changes matched the intent. The affected modules were built against an API with the junit and android.test classes removed. Any issues found during this process resulted in either the tool being updated to address the issue or a separate change being made to fix an existing problem with the build. A sample of the affected packages were run to ensure that they worked as expected at runtime; no issues were found during testing. The following change descriptions were generated automatically and so may be a little repetitive. They are provided to give the reviewer enough information to check the comments match what has actually been changed and check the reasoning behind the changes. * Android.mk Added 'junit' to LOCAL_JAVA_LIBRARIES because module LiveTv builds against 'LOCAL_SDK_VERSION := system_current' and uses classes from package junit (possibly indirectly) so will no longer compile once they are removed from the API. It was not added to LOCAL_STATIC_JAVA_LIBRARIES because LiveTv's manifest file (AndroidManifest.xml) targets API level 23 and uses the android.test.runner library which will provide the classes dynamically at runtime. * tests/func/Android.mk Added 'legacy-android-test' to LOCAL_JAVA_LIBRARIES because module TVFuncTests builds against 'LOCAL_SDK_VERSION := current' and uses classes from package android.test (possibly indirectly) so will no longer compile once they are removed from the API. It was not added to LOCAL_STATIC_JAVA_LIBRARIES because TVFuncTests's manifest file (AndroidManifest.xml) targets API level 23 and uses the android.test.runner library which will provide the classes dynamically at runtime. * tests/jank/Android.mk Added 'legacy-android-test' to LOCAL_JAVA_LIBRARIES because module TVJankTests builds against 'LOCAL_SDK_VERSION := current' and uses classes from package android.test (possibly indirectly) so will no longer compile once they are removed from the API. It was not added to LOCAL_STATIC_JAVA_LIBRARIES because TVJankTests's manifest file (AndroidManifest.xml) targets API level 23 and uses the android.test.runner library which will provide the classes dynamically at runtime. * tests/unit/Android.mk Added 'android.test.mock.sdk' and 'legacy-android-test' to LOCAL_JAVA_LIBRARIES because module TVUnitTests builds against 'LOCAL_SDK_VERSION := system_current' and uses classes from packages android.test and android.test.mock (possibly indirectly) so will no longer compile once they are removed from the API. They were not added to LOCAL_STATIC_JAVA_LIBRARIES because TVUnitTests's manifest file (AndroidManifest.xml) targets API level 23 and uses the android.test.runner library which will provide the classes dynamically at runtime. Dependency 'android.test.mock.sdk' is used instead of 'android.test.mock' because module TVUnitTests builds against the API not internal jars and so should use libraries that build against the API not internal jars. A future change will replace the dependency on 'legacy-android-test', which builds against the internal jars with a dependency on 'android.legacy.test' which will build against the API. Bug: 30188076 Test: make checkbuild and ran a sample of tests Change-Id: Ib64e14d0d20b6f3cc453e0660496fa6526be902d
2017-05-10Sync to ub-tv-dev at lost+android-o-preview-3android-n-iot-preview-4n-iot-preview-4Nick Chalko
hash 550cbec17259717c5453f6be1eb05736ba10ef1d Bug: 37849928 Test: tested on vendor branch Change-Id: I82190481d2bcef2b89e78414b6b92ed97720749d Merged-In: I4199ec04cacb4a78be58b85302a39d917658dc28
2017-03-09Refactor code incompatible with Mockito 2.7.13Paul Duffin
Bug: 32912773 Test: make checkbuild Change-Id: I615ac9acd8fccd1af640ebc4475dc9538a14c27e
2016-10-31Sync to ub-tv-killing at 6f6e46557accb62c9548e4177d6005aa944dbf33Youngsang Cho
Change-Id: I873644d6d9d0110c981ef6075cb4019c16bbb94b
2016-05-17DO NOT MERGE Sync to joey ub-tv-dev at e7fbaa585b1eb7afec05f05032d2e8d99fb595d4Youngsang Cho
Bug: 28469968 Change-Id: I74e368f5f58b433755932b806a90178e37bea7f9
2016-05-11DO NOT MERGE Revert "DO NOT MERGE Sync to joey ub-tv-dev at ↵Youngsang Cho
e7fbaa585b1eb7afec05f05032d2e8d99fb595d4" This reverts commit 369b6a409204a9b2a95f7ba575d7c3b7bdc94ab7. Change-Id: I9abfc39974fa42edcc1eb6b6ec2e53782b4fcf5f
2016-05-09DO NOT MERGE Sync to joey ub-tv-dev at e7fbaa585b1eb7afec05f05032d2e8d99fb595d4Youngsang Cho
Bug: 28469968 Change-Id: Ie0d3c74af84777dd8f2e2a79aa0454c7e6a7f0d8
2016-02-26Sync to ub-tv-interns at cc7c29d2a24a1343498f6d95ca5a79e003e6aefeNick Chalko
Change-Id: I580da190231e47c65b69f425b30ec4685eb50ce4
2015-12-11Sync to ub-tv-heroes at 1.08.301Nick Chalko
source change id If9b64d7bbc6e8f77b360e502d34e5452775c0402 Change-Id: I4ffe87911cb85e54880d1d918d1b8fb7bb8cfb7d
2015-11-10Sync to ub-tv-glee at 1.07.007Nick Chalko
hash dce17da9f45fc4304787b1898d9915511b1df954 Change-Id: I08ac6fc0123a6653644281155e35c11b71bc5fa0
2015-09-16Sync to ub-tv-friends at 1.06.202Nick Chalko
git hash 3c1965f5dcc60243f1fe600cb35f19bd5f01fc27 Change-Id: I90b77790f9074677ecef72a23235d2b33eacb76a
2015-08-05Sync to ub-tv-er at d42edb5e9834a40dacf6dcd2d33f983362a33994Nick Chalko
This changes the app name to "Live TV" Bug: 22959084 Change-Id: I66f5579e7b949485a73f80f1ac614a35f986c112
2015-08-05Sync to ub-tv-er at 1ca2537791704723075f1d1952bb9592b163ce83Nick Chalko
This fixes the broken build. Change-Id: I18e5792fca45400d2e6146bac23479cb18bcba0b
2015-08-03Migrate Live Channels App Src to AOSP branchNick Chalko
Bug: 21625152 Change-Id: I07e2830b27440556dc757e6340b4f77d1c0cbc66
2014-04-22Initial check-in of TV appYoungsang Cho
TV is an app playing TV based on TV input framework. The app has basic TV features : Channel up/down, input change, input name configuration, and so on. Change-Id: If9a3bf1d5535ab6c649ce44b71d3665d8ba4b03f