aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-01-02Replace USER with BUILD_USERNAMEandroid-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-releaseDan Willemsen
USER may be "nobody" if the build is sandboxed. BUILD_USERNAME will have the original value in all cases. Bug: 122270019 Test: none Change-Id: Ic64f842864a9e79ea2179228370bb4fd92541d20
2018-10-24Merge pie-platform-release to aosp-master - DO NOT MERGEandroid-wear-8.0.0_r2android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsandroid-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7android-n-iot-release-ihome-igv1nougat-iot-releaseBill Yi
Change-Id: I26b14bc9175bf07d6dd3b7505a9876927aaf62e1
2018-10-20Restore "Use HAS_BUILD_NUMBER to check engineering build"Nan Zhang
And use BUILD_NUMBER_FROM_FILE instead of BUILD_NUMBER to reduce build reruns. This was reverted in 6a2a9219b9ea3a2a9b56acd7038c9819f8959c35 Test: m -j32 Bug: b/70351683 Change-Id: I4ac6e62c716c05b103db3a3e09ec288a46149b18 Original-Change-Id: If5eb8891920ddd0486e263dd996f21efd36677c0
2018-10-15Update robolectric dependency to v3.6.2.Tobias Thierer
am: 7f80b264f2 Change-Id: I40a6fd6c38e30b8bc18d7cf1886b64b2a628c9f4
2018-10-12Update robolectric dependency to v3.6.2.Tobias Thierer
This is required for support of v53 .class files. Test: The following tests pass both before and after this CL: make RunFrameworksServicesRoboTests RunBluetoothRoboTests \ RunCarMessengerRoboTests RunKeyChainRoboTests \ RunManagedProvisioningRoboTests Test: The above tests also pass when EXPERIMENTAL_USE_OPENJDK9=true (they didn't pass with v3.6.1). Test: The following tests fail both before and after this CL (error trying to mock a final class): make RunStorageManagerRoboTests RunEmergencyInfoRoboTests Bug: 116872534 Change-Id: I16a7bc39bf77d3e029acee945bcf4ab4f6e4e1ca
2018-08-07Merge Android Pie into master am: aca2657222Xin Li
am: c968ce3f8f Change-Id: I4aced3385dd7a529a3fe19b8d8543fce7a617611
2018-08-07Merge Android Pie into masterXin Li
am: aca2657222 Change-Id: I198389a4b295ca76ba259fa5415108c971434e25
2018-08-06Merge Android Pie into masterandroid-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-releaseXin Li
Bug: 112104996 Change-Id: Iec32f622f0bb1bc1583aefcbf6d115ad05baa693
2018-06-15Fix ManifestMerger issues am: 5fdc24aa6cColin Cross
am: c56e189220 Change-Id: I3f3c32bfb15ed7cc5f12d2076d3311073abaafb2
2018-06-15Fix ManifestMerger issuestemp_p_mergeColin Cross
am: 5fdc24aa6c Change-Id: I0f4caaf968fdca40124e08184b29a9662c349bc0
2018-06-15Fix ManifestMerger issuesColin Cross
am: f9abc344d6 Change-Id: Ife4901ae5493c5e45640376055c692d0014bd997
2018-06-15Fix ManifestMerger issuesColin Cross
Set LOCAL_MIN_SDK_VERSION in tv libraries so that the build system doesn't raise the minSdkVersion value specified in the manifest, which causes ManifestMerger to error when trying to merge it into a package that specifies a lower minSdkVersion. Bug: 78447299 Test: m java Change-Id: I492916ffd17c3e454e4c8b19697153c7abb5763c
2018-06-14Fix ManifestMerger issuesandroid-p-preview-5android-p-preview-4android-o-mr1-iot-release-1.0.2android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayColin Cross
Set LOCAL_MIN_SDK_VERSION in tv-common so that the build system doesn't raise the minSdkVersion value specified in the manifest, which causes ManifestMerger to error when trying to merge it into a package that specifies a lower minSdkVersion. Bug: 78447299 Test: m java Change-Id: Id49101542185ee5e0dc8c06928126e2f36c26f5c
2018-06-09Merge pi-dev-plus-aosp-without-vendor into stage-aosp-masterXin Li
am: 3d7a02a34d Change-Id: I1d2f55267cc87f23d9a86f17f3df5f5f98065f5b
2018-06-08Merge pi-dev-plus-aosp-without-vendor into stage-aosp-masterXin Li
Bug: 79597307 Change-Id: I2aed66909831766ab308bfe4dd32f310d533c05a
2018-05-07[automerger skipped] convert LiveTv to aapt2 am: 17850fe0bfDake Gu
am: d195718c2e -s ours Change-Id: I71cc534b85071b587344d10f4b4f8f1e2dc8eb01
2018-05-07[automerger skipped] Stop using custom prebuilt support-tv-provider am: ↵Dan Willemsen
67b0265c8b am: 0ff776a045 -s ours Change-Id: I230cf22562c9e60ed1a8c1359a7631e5c7debd72
2018-05-07convert LiveTv to aapt2Dake Gu
am: 17850fe0bf Change-Id: I9f5d1d04a51ec13b0b00ff04deeb4df3408500cd
2018-05-07Stop using custom prebuilt support-tv-providerDan Willemsen
am: 67b0265c8b Change-Id: I7f94b79c64b4a8d2d93d717bf2b1f3c358ded554
2018-05-02convert LiveTv to aapt2android-p-preview-3android-p-preview-2android-o-mr1-iot-release-1.0.1android-n-iot-release-polk-at1Dake Gu
To avoid hardcode resource directories. Bug: NA Test: make Change-Id: If8778b8c293eb10818baa1dead38d8ac3ee30cb3 Merged-In: If8778b8c293eb10818baa1dead38d8ac3ee30cb3 (cherry picked from commit d0b4dee914668ad32185d82146947cacade657e2)
2018-05-02Stop using custom prebuilt support-tv-providerDan Willemsen
That file is going away with the latest support drop. Use `android-support-tv-provider`, which will use the correct version of the library that matches all the other android-support-* libraries. Bug: 64723465 Test: mmma packages/apps/TV Test: tapas TV; m Change-Id: Ic250b40982a161cf3858f5c792bb3f3c37b2271e Merged-In: Ic250b40982a161cf3858f5c792bb3f3c37b2271e (cherry picked from commit cc8c60afeddd75ecb1e8eb6de74a16f22e9256e0)
2018-05-02apps/TV: Update path to android.jar. am: 57a51eb0d7Anton Hansson
am: 9e518ce7cb Change-Id: I1261968a872337ed4ce87bf07c97f1e506093793
2018-05-02apps/TV: Update path to android.jar.Anton Hansson
am: 57a51eb0d7 Change-Id: I5df4e90cf2d64051574763d9739637e117e4bf79
2018-05-01apps/TV: Update path to android.jar.android-wear-p-preview-2android-o-mr1-iot-release-1.0.0Anton Hansson
This file is being moved. Update the path here so that the old file can be deleted. Bug: 77525052 Test: No Change-Id: Ieff6f28c2093b180d02f7e098d39b0985b9a4bb5
2018-03-04Snap for 4632767 from d81330d97f64f41079c48cad5d21c95c06a8ac62 to pi-releaseandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-platform-releasepie-gsipie-cuttlefish-testingpie-cts-releaseandroid-build-team Robot
Change-Id: Ib1e3f32034515b3ae4ab68e30f71ad6f77828a3f
2018-03-02Merge "Disable Support Library dependency resolution"android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-devAlan Viverette
2018-02-27Disable Support Library dependency resolutionAlan Viverette
Bug: 73250914 Test: make checkbuild cts Change-Id: I524f096c7eab8ed1d64ace580ca43bf4f4404c56
2018-02-27Snap for 4623514 from 9c2467845b7c4dbf37f6b7828c8da4e86e6b2d34 to pi-releaseandroid-build-team Robot
Change-Id: Ifa881647f5744f0e1f813b3780d6bd224992baa6
2018-02-26CLEANUP: fix vararg errors by inlining vargarg methodnchalko
PiperOrigin-RevId: 187036672 Change-Id: Ia1550285ca0d4c2d5b0c4ce8ed5638c3e9fe9c7e
2018-02-26Write DVR failed reasons to DBshubang
PiperOrigin-RevId: 186845549 Change-Id: I327129322ade4ef3ef0110bb51ec8f172c7a99ec
2018-02-26Cleanup change generated by Refaster (go/refaster) to directories ↵nchalko
//third_party/java_src/android_app/live_channels/tests/unit/src/...:all with template java/com/google/devtools/javatools/refactory/refaster/cleanups:TruthMigration Also added some javadoc and stopped using MoreAsserts PiperOrigin-RevId: 186830589 Change-Id: I277cf771e3eb7b2f1656810655fe68ac30811cca
2018-02-26FIX: dpad up and down should change channels even when talk back is on.nchalko
PiperOrigin-RevId: 186830435 Change-Id: I93d4d047654df6b3a6e98d29c79181cdd1668611
2018-02-26Add failed reason to ScheduledRecording tableshubang
To show error message / falied reason, this field should be stored in DB. PiperOrigin-RevId: 186818079 Change-Id: I9de775fbe9ca0cdcff0a20c68b39a4acf6208899
2018-02-26CLEANUP: Ignore testCustomizeChannelList_timeoutnchalko
PiperOrigin-RevId: 186675628 Change-Id: I45b403a1aae269d0660992509207ded14bc4b521
2018-02-26FIX: Leave controls displayed when accessibility is turned on.nchalko
PiperOrigin-RevId: 186633960 Change-Id: If81f40a26e7636663da32f46d8b69c33e662e3d0
2018-02-26Add tests for DvrBrowseFragmentshubang
PiperOrigin-RevId: 186565879 Change-Id: Ie379b73760cef7a16670353280cf119c1e484a9b
2018-02-26Show failed recordings in DVR recent rowshubang
PiperOrigin-RevId: 186556969 Change-Id: I3410d9ea1db451d2e4711631ccd530f9179b428d
2018-02-26Handle click and row updated/added/removed in DVR historyshubang
PiperOrigin-RevId: 186532869 Change-Id: Ida96e009a631ce737b02cf4bf52fe2c8065a2d65
2018-02-25Snap for 4620899 from 7737f2ff103e5f8fecad10d1755cb78760f9135b to pi-releaseandroid-build-team Robot
Change-Id: Iad2e4765ce7a59f1389486352ddbc2fd084c8d03
2018-02-23Merge changes I9d3158cd,I85304d06,I7facfa4d,I689eff2aNick Chalko
* changes: CLEANUP: Migrate SampleSourceExtractorTest to robotest CLEANUP: Move VerySlowSampleChunk to a shared testing package CLEANUP: Convert TvActivityTest to robolectric CLEANUP: Add build target for recomendation tests
2018-02-22Snap for 4615953 from a75e73b3b367eecc2bdea4f7fbfd88512fcc95fe to pi-releaseandroid-build-team Robot
Change-Id: Ic71f385a5b80bb2dda0ac93f5b09ce1e33564027
2018-02-22Use HAS_BUILD_NUMBER to check engineering build am: 9d03eaf85c am: 83c538af11Nan Zhang
am: 6d35e804a6 Change-Id: I55998a189e2e95a5d3b928c3cc7d9849082a3937
2018-02-22Use HAS_BUILD_NUMBER to check engineering build am: 9d03eaf85cNan Zhang
am: 83c538af11 Change-Id: I52817fed0cd463c032edf19646c6aecf51d0ef73
2018-02-22Use HAS_BUILD_NUMBER to check engineering buildNan Zhang
am: 9d03eaf85c Change-Id: I739920bcae682c950a135f51f499d5ee6bd28567
2018-02-21CLEANUP: Migrate SampleSourceExtractorTest to robotestnchalko
PiperOrigin-RevId: 186372628 Change-Id: I9d3158cd6752e2181c74c52d91f13e19e618bd07
2018-02-21CLEANUP: Move VerySlowSampleChunk to a shared testing packagenchalko
PiperOrigin-RevId: 186341141 Change-Id: I85304d064910b32b293a7c2dc3b610e3f0f109ac
2018-02-21CLEANUP: Convert TvActivityTest to robolectricnchalko
PiperOrigin-RevId: 186340446 Change-Id: I7facfa4d124b53ebccc4575c5d82dc35d93ede0c
2018-02-21CLEANUP: Add build target for recomendation testsnchalko
PiperOrigin-RevId: 186339593 Change-Id: I689eff2af0cb682415c23f5afdb9ba33bfc02d23
2018-02-21Add a test for DvrHistoryRowAdaptershubang
PiperOrigin-RevId: 186338292 Change-Id: Ide49e58a67e0f0331f65ce3601a7619a0894cd62
2018-02-21Add missing license headernchalko
PiperOrigin-RevId: 186335607 Change-Id: Ief132e8b824834d78c77aca96816e65d49aa63f3