aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-03-21Snap for 4657601 from 411c4a576a92253a386784dddb646a2671b5d6f9 to oc-m4-releaseandroid-8.1.0_r67android-8.1.0_r65android-8.1.0_r64android-8.1.0_r63android-8.1.0_r62android-8.1.0_r61android-8.1.0_r60android-8.1.0_r53android-8.1.0_r51android-8.1.0_r48android-8.1.0_r45android-8.1.0_r42android-8.1.0_r40android-8.1.0_r39android-8.1.0_r38android-8.1.0_r37android-8.1.0_r32android-8.1.0_r31android-8.1.0_r29android-8.1.0_r28android-8.1.0_r27oreo-m8-releaseoreo-m4-s9-releaseoreo-m4-s8-releaseoreo-m4-s7-releaseoreo-m4-s6-releaseoreo-m4-s5-releaseoreo-m4-s4-releaseoreo-m4-s3-releaseoreo-m4-s2-releaseoreo-m4-s12-releaseoreo-m4-s11-releaseoreo-m4-s10-releaseandroid-build-team Robot
Change-Id: I9cf72597c1e2e90340916596878ff754ec945f4c
2017-10-09Snap for 4384531 from bb2e798ef4d546dd54cd9e95796403062b860c15 to oc-m2-releaseandroid-8.1.0_r8android-8.1.0_r52android-8.1.0_r50android-8.1.0_r47android-8.1.0_r46android-8.1.0_r43android-8.1.0_r41android-8.1.0_r36android-8.1.0_r35android-8.1.0_r33android-8.1.0_r30android-8.1.0_r26android-8.1.0_r25android-8.1.0_r20android-8.1.0_r2oreo-m7-releaseoreo-m6-s4-releaseoreo-m6-s3-releaseoreo-m6-s2-releaseoreo-m2-s5-releaseoreo-m2-s4-releaseoreo-m2-s3-releaseoreo-m2-s2-releaseoreo-m2-s1-releaseoreo-m2-releaseandroid-build-team Robot
Change-Id: I06099c50eb5f4c5791fab1e6055cca20fb367c6d
2017-10-05Snap for 4378450 from 6ebde20b03db4c0d57f67acaac11832b610b966b to oc-mr1-releaseandroid-wear-8.1.0_r1android-vts-8.1_r9android-vts-8.1_r8android-vts-8.1_r7android-vts-8.1_r6android-vts-8.1_r5android-vts-8.1_r4android-vts-8.1_r3android-vts-8.1_r14android-vts-8.1_r13android-vts-8.1_r12android-vts-8.1_r11android-vts-8.1_r10android-security-8.1.0_r93android-security-8.1.0_r92android-security-8.1.0_r91android-security-8.1.0_r90android-security-8.1.0_r89android-security-8.1.0_r88android-security-8.1.0_r87android-security-8.1.0_r86android-security-8.1.0_r85android-security-8.1.0_r84android-security-8.1.0_r83android-security-8.1.0_r82android-cts-8.1_r9android-cts-8.1_r8android-cts-8.1_r7android-cts-8.1_r6android-cts-8.1_r5android-cts-8.1_r4android-cts-8.1_r3android-cts-8.1_r25android-cts-8.1_r24android-cts-8.1_r23android-cts-8.1_r22android-cts-8.1_r21android-cts-8.1_r20android-cts-8.1_r2android-cts-8.1_r19android-cts-8.1_r18android-cts-8.1_r17android-cts-8.1_r16android-cts-8.1_r15android-cts-8.1_r14android-cts-8.1_r13android-cts-8.1_r12android-cts-8.1_r11android-cts-8.1_r10android-cts-8.1_r1android-8.1.0_r81android-8.1.0_r80android-8.1.0_r79android-8.1.0_r78android-8.1.0_r77android-8.1.0_r76android-8.1.0_r75android-8.1.0_r74android-8.1.0_r73android-8.1.0_r72android-8.1.0_r71android-8.1.0_r70android-8.1.0_r69android-8.1.0_r68android-8.1.0_r66android-8.1.0_r6android-8.1.0_r5android-8.1.0_r4android-8.1.0_r3android-8.1.0_r23android-8.1.0_r19android-8.1.0_r16android-8.1.0_r15android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10android-8.1.0_r1security-oc-mr1-releaseoreo-mr1-wear-releaseoreo-mr1-vts-releaseoreo-mr1-security-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-mr1-cuttlefish-testingoreo-mr1-cts-releaseoreo-m4-s1-releaseandroid-build-team Robot
Change-Id: I07f19344c030a9c2b0fd7ba425f7bf7462575f92
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-18release-request-c9e3b153-009d-4386-b83e-337752602795-for-git_oc-mr1-release- ↵android-build-team Robot
4111654 snap-temp-L22900000075285650 Change-Id: Idfae16e60a819e2d4fd704becd19ed2f5a71cbe1
2017-06-15Fix dependencies of packages that target earlier releases am: 0e0082535dPaul Duffin
am: 8240a88ba4 Change-Id: Ice62d2458e2dc88378dee0f033e4b79b76074e05
2017-06-15Fix dependencies of packages that target earlier releasesPaul Duffin
am: 0e0082535d Change-Id: I2353e3caf51b8819b2071b712a1c823245549bb6
2017-06-15Fix dependencies of packages that target earlier releasesandroid-o-mr1-preview-2android-o-mr1-preview-1Paul 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 Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because LiveTv's manifest file (AndroidManifest.xml) targets API level 23 and dynamically includes the android.test.runner library at runtime so there is no point in statically including the classes. It was not added to LOCAL_JAVA_LIBRARIES because module LiveTv does not have any dependencies on android.test classes Bug: 30188076 Test: make checkbuild and ran a sample of tests Change-Id: I642ff8a4e8c8198d3749f4392e24197583be210c
2017-06-15Fix dependencies of packages that target earlier releases am: 7416628255 am: ↵Paul Duffin
33704b7c1e am: ab87bbbb44 am: dfa7d244c6 Change-Id: I0661b574af719c4337b9c5b0002743d259b9a388
2017-06-15Fix dependencies of packages that target earlier releases am: 7416628255 am: ↵Paul Duffin
33704b7c1e am: ab87bbbb44 Change-Id: Id83e924a094cef9ca95959bdc14c3416740e251c
2017-06-15Fix dependencies of packages that target earlier releases am: 7416628255Paul Duffin
am: 33704b7c1e Change-Id: I9750cfd7d7233cd841cef6bbf66b97c6f89538c0
2017-06-15Fix dependencies of packages that target earlier releasesPaul Duffin
am: 7416628255 Change-Id: I12b7e209f7697fde8f3641796540fa8f6ce25be1
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-06-08release-request-01b39c26-bf86-40a5-a7bf-8eb15c488673-for-git_oc-mr1-release- ↵android-build-team Robot
4080221 snap-temp-L23400000072087081 Change-Id: Ia64b1d8f28873773730a32ae3ba73376f494ef10
2017-06-06Add OWNERS in packages/apps/TV am: 7e62ba8256 am: 5415d6e49a am: 6ec9c1ecd4oreo-dr1-devChih-Hung Hsieh
am: 9342e8c7a7 Change-Id: I7ac080cd1b28c7160c0fc72d16a21e273e5d1b4e
2017-06-06Add OWNERS in packages/apps/TV am: 7e62ba8256 am: 5415d6e49aChih-Hung Hsieh
am: 6ec9c1ecd4 Change-Id: Id32e24f329aceb2d260c95732c9ecd022c477175
2017-06-06Add OWNERS in packages/apps/TV am: 7e62ba8256Chih-Hung Hsieh
am: 5415d6e49a Change-Id: I644cb0604a42708862b091899d1ac1f292ac0763
2017-06-06Add OWNERS in packages/apps/TVChih-Hung Hsieh
am: 7e62ba8256 Change-Id: I4b0c12e56773513e78fe2d6f1b689e3cfd979acf
2017-06-06Add OWNERS in packages/apps/TVChih-Hung Hsieh
* Owners are selected from top CL approvals or owners. They will be suggested to review/approve future CLs. * OWNERS files are recognized by the new find-owners plugin, see .md files in https://gerrit.googlesource.com/plugins/find-owners/+/master/src/main/resources/Documentation/ Test: build/make/tools/checkowners.py -c -v OWNERS Change-Id: I39334a4dd0fe604935efa4b2a0dfcc9dfbde5e7a
2017-05-17release-request-323db86e-b638-4d24-8eb1-d2e3bf4a9d1a-for-git_oc-mr1-release- ↵android-build-team Robot
4017779 snap-temp-L47900000064949209 Change-Id: Id79f5969801b9b4e44dc44df860917b09f6610ef
2017-05-10Sync to ub-tv-dev at lost+ hash 550cbec17259717c5453f6be1eb05736ba10ef1d am: ↵Nick Chalko
0550a7221b am: c11f019e2f am: 95c15c9733 -s ours am: 81077a89c3 -s ours Change-Id: Ia14a706fb3874617e3438bfcf5b87f71049ee619
2017-05-10Sync to ub-tv-dev at lost+ hash 550cbec17259717c5453f6be1eb05736ba10ef1d am: ↵Nick Chalko
0550a7221b am: c11f019e2f am: 95c15c9733 -s ours Change-Id: I4873b55e1fea2069de5a47ea387700aa68269cb4
2017-05-10Sync to ub-tv-dev at lost+ hash 550cbec17259717c5453f6be1eb05736ba10ef1d am: ↵Nick Chalko
0550a7221b am: c11f019e2f Change-Id: I4645f478a402648d74c1d103f87959cd71c57ae5
2017-05-10Sync to ub-tv-dev at lost+ hash 550cbec17259717c5453f6be1eb05736ba10ef1dNick Chalko
am: 0550a7221b Change-Id: Id38d8bc09ffbf856c8976893096c47d3bcc8b8b7
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-05-05Revert "Sync to ub-tv-dev at f0024d79653da8c8999a91f995431a645a6ff4a2"Adrian Roos
This reverts commit 3dfa929b24f38ac7836450176d88ceab41dc6ac5. Change-Id: I1c76f626d966b8d4793a19677a8840ed0424d3a7
2017-05-05Sync to ub-tv-dev at f0024d79653da8c8999a91f995431a645a6ff4a2Nick Chalko
Change-Id: I4199ec04cacb4a78be58b85302a39d917658dc28
2017-05-03Remove duplicate items in dimens.xml am: 2c57908374Chulwoo Lee
am: eb14333e2b Change-Id: Ibf2258d567a8ff2a7afa02f35d1fe9f96dfce788
2017-05-03Remove duplicate items in dimens.xmlChulwoo Lee
am: 2c57908374 Change-Id: Id124f22eb223fe73df7a46c5d404c991bfc0fe20
2017-05-02Remove duplicate items in dimens.xmlandroid-vts-8.0_r2android-vts-8.0_r1oreo-devChulwoo Lee
This is applying ag/2046743. Test: Build Bug: 37893204 Change-Id: I32f368276441ff991463b98a0baead235b77e62a
2017-03-10Refactor code incompatible with Mockito 2.7.13 am: a1ba743962 am: 430c2be3b9Paul Duffin
am: 62bd372111 Change-Id: Ief852d9eeaee02325f37e8085acc45c33ecf4910
2017-03-10Refactor code incompatible with Mockito 2.7.13 am: a1ba743962Paul Duffin
am: 430c2be3b9 Change-Id: I71d20032249676d002791ea4bf663041c1b5a8e8
2017-03-10Refactor code incompatible with Mockito 2.7.13android-wear-o-preview-4android-wear-o-preview-3android-o-preview-2Paul Duffin
am: a1ba743962 Change-Id: I0b6870f3923c7e4e3c3d25de8114910bc3acda28
2017-03-09Refactor code incompatible with Mockito 2.7.13Paul Duffin
Bug: 32912773 Test: make checkbuild Change-Id: I615ac9acd8fccd1af640ebc4475dc9538a14c27e
2017-03-03Prepare for removal of junit and android.test classes from Android API (step ↵Paul Duffin
1) am: 79f2e98d97 am: da81c0d85c am: e95d17cd9c Change-Id: Ia1b0bc2b9d0894395383f1d84cddcf6792155c74
2017-03-03Prepare for removal of junit and android.test classes from Android API (step ↵Paul Duffin
1) am: 79f2e98d97 am: da81c0d85c Change-Id: I15bab91af9ccfe115e8b53bbaa8ae362859726fa
2017-03-03Prepare for removal of junit and android.test classes from Android API (step 1)Paul Duffin
am: 79f2e98d97 Change-Id: I80e328d92646e0b2cd0fdfd3b4683cbb0178d103
2017-03-01Prepare for removal of junit and android.test classes from Android API (step 1)android-o-preview-1o-previewPaul Duffin
In preparation for removing junit and android.test classes from the Android API this change adds explicit dependencies on junit and/or legacy-android-test to ensure that modules will compile properly once it is removed. Care was taken to ensure that any targets that depended, directly or indirectly, on android-support-test did not also depend on junit or hamcrest as they conflict with the versions embedded within android-support-test. Bug: 30188076 Test: make checkbuild Change-Id: I8492291989094622107a4b5447ce797526cb639b
2017-02-18Fix CaptionLayout class name in ut_overlay_view am: 90408d018b am: 8e4fc6d729Trevor Drake
am: 63115c2a65 Change-Id: I937b538f6390cafb4c438baaeb246756f72e5c74
2017-02-18Fix CaptionLayout class name in ut_overlay_view am: 90408d018bTrevor Drake
am: 8e4fc6d729 Change-Id: I045beb43e9c98d28e95228031018f10b6a1640f0
2017-02-18Fix CaptionLayout class name in ut_overlay_viewTrevor Drake
am: 90408d018b Change-Id: I39b55a89e9d7d96dd6994b14e423813025ed2005
2017-02-16Fix CaptionLayout class name in ut_overlay_viewTrevor Drake
The ut_overlay_view attempting to use com.google.android.tv.tuner.cc.CaptionLayout. The correct value should be com.android.tv.tuner.cc.CaptionLayout Error Observerd E TunerTvInputService: Creating a session for com.android.tv/.tuner. tvinput.TunerTvInputService failed. E TunerTvInputService: android.view.InflateException: Binary XML file line #53: Binary XML file line #53: Error inflating class com.google.android.tv.tuner.cc.CaptionLayout E TunerTvInputService: Caused by: android.view.InflateException: Binary XML file line #53: Error inflating class com.google.android.tv .tuner.cc.CaptionLayout E TunerTvInputService: Caused by: java.lang.ClassNotFoundException: Didn't find class "com.google.android.tv.tuner.cc.CaptionLayout" on path: DexPathList[[zip file "/system/priv-app/LiveTv/LiveTv.apk"], nativeLibraryDirectories=[/system/priv-app/LiveTv/lib/arm64, /system/fake-libs64, /system/priv-app/LiveTv/LiveTv.apk!/lib/arm64-v8a, /system/lib64, /vendor/lib64, /system/lib64, /vendor/lib64]] Test: Manual Tuner should have channels setup. Start the TV Application Observe the Application starts successfully Change-Id: I53e2dc267ce38096453c1f3732a71b80d0453925 Signed-off-by: Trevor Drake <trevd1234@gmail.com>
2017-02-14Remove use of junit.framework.Assert in non-test code am: 2728397759 am: ↵Jae Seo
57fc9514a7 am: daf40d88db am: 0853732534 Change-Id: Ib049a8c8adeb242927dfb0bcc9e205e87ae2a553
2017-02-14Remove use of junit.framework.Assert in non-test code am: 2728397759 am: ↵Jae Seo
57fc9514a7 am: daf40d88db Change-Id: I36e4e8c1a4de09bae0a33bdd401ce3ee3467bce9
2017-02-14Remove use of junit.framework.Assert in non-test code am: 2728397759Jae Seo
am: 57fc9514a7 Change-Id: Ic26080d733768d511e4c9300daa7897aa45b9a99
2017-02-14Remove use of junit.framework.Assert in non-test codeJae Seo
am: 2728397759 Change-Id: I8ef4657f4c7ed65151e650bd7b499c530f975aa8
2017-02-13Remove use of junit.framework.Assert in non-test codeJae Seo
Bug: 35235056 Test: build Change-Id: I53b4807ba1d8010e87825f5887e674d7587a6738
2017-01-18DO NOT MERGE: Revert "Update package names to work with the proto3 compiler" ↵Tamas Berghammer
am: 7d31e354ea am: adbd814f32 -s ours Change-Id: I46e7e2a20b287ae6d1222c4fb29917fc6823c64d
2017-01-18DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"Tamas Berghammer
am: 7d31e354ea Change-Id: I4555679cf1f6dc1fd8fbc30fe50f3430d86f2539
2017-01-18Update package names to work with the proto3 compiler am: 8b660aad9dTamas Berghammer
am: 11ab91c64b Change-Id: I51310f2d538636e050a3b8f33f54fda7e0a17951
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 22:31:05 +0000