aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-10-31Sync to ub-tv-killing at 6f6e46557accb62c9548e4177d6005aa944dbf33Youngsang Cho
Change-Id: I873644d6d9d0110c981ef6075cb4019c16bbb94b
2016-09-23Fix a typo in usbtuner/Android.mkYoungsang Cho
Bug: 31551073 Change-Id: I62b7c1f20b3fc842bf5a578eb5a0069bca1b2093 Merged-In: I0aa43094d103de28956a3d9b56a594ea46a20543
2016-09-23DO NOT MERGE Revert "DO NOT MERGE Fix a typo in usbtuner/Android.mk"Youngsang Cho
This reverts commit 36e30aad3353bd4626fb08edd1d57010944c7e7e. Change-Id: Ie30adee0be6fc38735b9887d02340aa8b24d95fc
2016-09-22Remove PROTOC overrideDan Willemsen
This must be configured in build/ if desired. The aprotoc prebuilt was updated recently, so this shouldn't be a big jump. Bug: 31551523 Test: mma, aprotoc output is identical Change-Id: Ie18909825fe8ee537b8eade48304f396c183d76f Merged-In: I0d7a00ffdda9c26ca25598360dcef92779eb862e
2016-09-22DO NOT MERGE Fix a typo in usbtuner/Android.mkYoungsang Cho
Bug: 31551073
2016-09-16Don't add BUILD_NUMBER to version for platform buildsDan Willemsen
We're removing differences between two builds that have the same source. These builds will have different BUILD_NUMBERs though, so it shouldn't be embedded in the binary. For eng builds, using the current date forces the APK to be rebuilt every time the makefiles are read. Remove this for platform builds, but keep it if building unbundled. Bug: 24201956 Test: Inspect ninja file for changes between two runs Change-Id: Ib42efb54ae6c6859389eb5e81b6a6f337696d049
2016-09-07Fix empty set to be of type String.Ian Rogers
Fixes error prone build. Bug: 27723540 Bug: 31140497 Change-Id: Iad2bfee291c02e88c9811c648f96ab27e34fd734 (cherry picked from commit 6dc65d5cd5fe9fee30a3b1054e2022ad471db5e0)
2016-08-24Merge remote-tracking branch 'goog/stage-aosp-master' into HEADBill Yi
2016-05-19DO NOT MERGE Refer frameworks/support instead of prebuilts/sdk/current/supportYoungsang Cho
am: f3ddd19765 * commit 'f3ddd197653e536d9d0c4b47de4fe1d6d9207fa9': DO NOT MERGE Refer frameworks/support instead of prebuilts/sdk/current/support Change-Id: I065e9177a0fc293066526cd21b820c26b60e96bd
2016-05-19DO NOT MERGE Sync to joey ub-tv-dev at e7fbaa585b1eb7afec05f05032d2e8d99fb595d4Youngsang Cho
am: 48dadb4924 * commit '48dadb49248271b01997862e1335912a4f2e189f': DO NOT MERGE Sync to joey ub-tv-dev at e7fbaa585b1eb7afec05f05032d2e8d99fb595d4 Change-Id: Ibee82a8625935465f4426629c146f80e19b75361
2016-05-17DO NOT MERGE Refer frameworks/support instead of prebuilts/sdk/current/supportandroid-cts-7.0_r9android-cts-7.0_r8android-cts-7.0_r7android-cts-7.0_r6android-cts-7.0_r5android-cts-7.0_r4android-cts-7.0_r33android-cts-7.0_r32android-cts-7.0_r31android-cts-7.0_r30android-cts-7.0_r3android-cts-7.0_r29android-cts-7.0_r28android-cts-7.0_r27android-cts-7.0_r26android-cts-7.0_r25android-cts-7.0_r24android-cts-7.0_r23android-cts-7.0_r22android-cts-7.0_r21android-cts-7.0_r20android-cts-7.0_r2android-cts-7.0_r19android-cts-7.0_r18android-cts-7.0_r17android-cts-7.0_r16android-cts-7.0_r15android-cts-7.0_r14android-cts-7.0_r13android-cts-7.0_r12android-cts-7.0_r11android-cts-7.0_r10android-cts-7.0_r1android-7.0.0_r9android-7.0.0_r8android-7.0.0_r7android-7.0.0_r6android-7.0.0_r5android-7.0.0_r4android-7.0.0_r36android-7.0.0_r35android-7.0.0_r34android-7.0.0_r33android-7.0.0_r32android-7.0.0_r31android-7.0.0_r30android-7.0.0_r3android-7.0.0_r29android-7.0.0_r28android-7.0.0_r27android-7.0.0_r24android-7.0.0_r21android-7.0.0_r19android-7.0.0_r17android-7.0.0_r15android-7.0.0_r14android-7.0.0_r13android-7.0.0_r12android-7.0.0_r11android-7.0.0_r10android-7.0.0_r1nougat-releasenougat-mr0.5-releasenougat-devnougat-cts-releasenougat-bugfix-releaseYoungsang Cho
prebuilts/sdk/current/support are different branch by branch. So we rather refer frameworks/support for resources. Change-Id: I9ecf511f3210897988d459419c7af79ba64b3401
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" am: 3a72b93e55 * commit '3a72b93e554bd22a5c64e71a6956d9604ce05108': DO NOT MERGE Revert "DO NOT MERGE Sync to joey ub-tv-dev at e7fbaa585b1eb7afec05f05032d2e8d99fb595d4" Change-Id: I7466ebe2933c63e46e9ad0bcb9a8758e06a5e7d9
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-10DO NOT MERGE Sync to joey ub-tv-dev at e7fbaa585b1eb7afec05f05032d2e8d99fb595d4Youngsang Cho
am: 369b6a4092 * commit '369b6a409204a9b2a95f7ba575d7c3b7bdc94ab7': DO NOT MERGE Sync to joey ub-tv-dev at e7fbaa585b1eb7afec05f05032d2e8d99fb595d4 Change-Id: I1d5fcd00dad4fe237ddc7091934415191210fed1
2016-05-09DO NOT MERGE Sync to joey ub-tv-dev at e7fbaa585b1eb7afec05f05032d2e8d99fb595d4Youngsang Cho
Bug: 28469968 Change-Id: Ie0d3c74af84777dd8f2e2a79aa0454c7e6a7f0d8
2016-03-28Replace tv-exoplayer.jar to the version compiled at mnc-ub-dev environmentYoungsang Cho
Change-Id: I8db6b4bd81fc865ab75d197e189cd35b111b390b
2016-03-25Replace ExoPlayer source to libraryYoungsang Cho
Bug: 26024293 Change-Id: Id36b31e0e62f6294f98132dcebfef5a600c19834
2016-03-09Quick fix a build breakage in read-only file systemYoungsang Cho
Bug: 27568978 Change-Id: I64071d6b4ad0cdc610b3f8c8c68a57165092a44b
2016-03-07Use unblockContent() instead of deprecated requestUnblockContent()Dongwon Kang
Bug: 25726685 Change-Id: Icb18b4ff86c6bf1c33b036bf97bcbc96738faf57
2016-03-04Revert "Temporarily remove LOCAL_PRIVILEGED_MODULE for build fix"Youngsang Cho
This reverts commit 5db3067c1abd85c5ab610c80aef6eaf450911648. Plus, it fixes the build breakage. Change-Id: I9cfa926aee32f66f3e83d170eb4bb0288e5fa5c2
2016-03-04Temporarily remove LOCAL_PRIVILEGED_MODULE for build fixYoungsang Cho
Change-Id: I7ab277302e6ffdca023025ba166cf3176deba6ed
2016-03-04Sync to ub-tv-intens at 4ef2591eb74883f8ae2ce15d4e89bec7da5320fcNick Chalko
Bug: 27219388 Change-Id: I50601d0e0f680f170829945689eef989308b02fa
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-21Initial empty repositoryBill Yi
2015-08-05Sync to ub-tv-er at 438e1ce2b9e8dc13b80c13bcf00a8377a669c860Nick Chalko
Use the TV banner for AOSP Bug: 22960152 Change-Id: Ifac52142914b0d1378775d9ec26653c483571888
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-08-06am 67beefdd: Applying the framework change for making Session class static.Dongwon Kang
* commit '67beefdda18b693664351172496cda2d92b06f14': Applying the framework change for making Session class static.
2014-08-06am 247b50b4: Merge "Initial commit of content rating XML parser" into lmp-devJaewan Kim
* commit '247b50b41ab9f63a287756b7356620317ef9abab': Initial commit of content rating XML parser
2014-08-06am 29f13c03: Merge "Use TvView.setZOrderOnTop for PIP" into lmp-devYoungsang Cho
* commit '29f13c03f81753a4f06b93910cfe01b9be4a8bba': Use TvView.setZOrderOnTop for PIP
2014-08-06am 333d3ee2: Merge "Add sample TV input for 2way pairing use case." into lmp-devDongwon Kang
* commit '333d3ee2cde4eebf4cf86e841cd7e844ad0da94c': Add sample TV input for 2way pairing use case.
2014-08-06am ec9bd880: Applying framework change for making selected tracks ↵Dongwon Kang
identifiable in TV and sample app. * commit 'ec9bd88036279df7421321b2e9945adf8f89db4b': Applying framework change for making selected tracks identifiable in TV and sample app.
2014-08-06Applying the framework change for making Session class static.Dongwon Kang
Change-Id: Ibed2b9bd9264c8b62f0d375b58c3639abbcda6dd
2014-08-05Applying framework change for making selected tracks identifiable in TV and ↵Dongwon Kang
sample app. Related chage: I226f75e697b0ce52b44db7471660f6d9f646f6f9 Change-Id: Ibeed892624a9675c59613148d47b77d3f857cc9b
2014-08-05am 5f496abf: Revive old side panel fragments until the new ones keep the ↵Youngsang Cho
feature parities * commit '5f496abf04ad5de1df0fd371f1f61a445bc70c6b': Revive old side panel fragments until the new ones keep the feature parities
2014-08-05Revive old side panel fragments until the new ones keep the feature paritiesYoungsang Cho
Newly refactored fragments missed some features like the back key behavior. Until they satisfy the parity, we need to keep both old and new ones. Change-Id: Ib08efe9581817e4cde1ecb0e017b08be30435ee7
2014-08-05am d2f225ac: Adjust color on TV appChulwoo Lee
* commit 'd2f225ac4f8a4604e1799cd289be722aa3476c33': Adjust color on TV app
2014-08-05am 6a5abb14: Merge "[WIP] Rework sidepanel to make adding options easier." ↵Christofer Åkersten
into lmp-dev * commit '6a5abb14996863d2668768422ce07976005f1904': [WIP] Rework sidepanel to make adding options easier.
2014-08-05am f14e7a95: Merge "Add SampleTvInput and FakeHardwareTvInput to build ↵Ji-Hwan Lee
server result" into lmp-dev * commit 'f14e7a958f78c7dbbff993f0c141c93126b807e4': Add SampleTvInput and FakeHardwareTvInput to build server result
2014-08-05Adjust color on TV appChulwoo Lee
BUG: 16652362 Change-Id: If184fd19d04e25dc738d266dccbcbc284675cd89
2014-08-05Merge "Initial commit of content rating XML parser" into lmp-devJaewan Kim
2014-08-05Initial commit of content rating XML parserJaewan Kim
Bug: 16113341 Change-Id: I6194a499eae626df77300370df47de6079f36d5e
2014-08-05Merge "Use TvView.setZOrderOnTop for PIP" into lmp-devYoungsang Cho
2014-08-05Use TvView.setZOrderOnTop for PIPYoungsang Cho
Bug: 16723028 Change-Id: I611a4936102a64459b6605861a1cc9263c320415
2014-08-05Merge "Add SampleTvInput and FakeHardwareTvInput to build server result" ↵Ji-Hwan Lee
into lmp-dev