aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-01-04[automerger skipped] Use Mockito 4.6.1 API am: 4262b88f33 -s ours am: ↵Sorin Basca
b0a7cadfd7 -s ours am skip reason: Merged-In I424015a4ec7e28c4775f7d2614d10d0958dcdb2e with SHA-1 f8a522d2c9 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/TV/+/20750952 Change-Id: I3d05410840a1a1854a60dffd1cdbe97358feaf43 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-04[automerger skipped] Use Mockito 4.6.1 API am: 4262b88f33 -s oursSorin Basca
am skip reason: Merged-In I424015a4ec7e28c4775f7d2614d10d0958dcdb2e with SHA-1 f8a522d2c9 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/TV/+/20750952 Change-Id: Id5c955c23c78e0bc1aa6d2724234a8bc5b7b4c77 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-28Use Mockito 4.6.1 APISorin Basca
Bug: 236636175 Test: m TVUnitTests Test: m RunTvRoboTests Change-Id: I424015a4ec7e28c4775f7d2614d10d0958dcdb2e Merged-In: I424015a4ec7e28c4775f7d2614d10d0958dcdb2e
2022-12-21Snap for 9426098 from 614ca636dfcd0a80b9349766611fe32ff1d28873 to udc-d1-releaseAndroid Build Coastguard Worker
Change-Id: I271f86ad0dea062fb4489bc08f05a9c7c5204d13
2022-12-21Snap for 9425524 from fdcf63f86321e79739b511491d05fefb2db371d5 to udc-releaseAndroid Build Coastguard Worker
Change-Id: I895d7536ca7cad9ac3825d088dd16db736fc80f2
2022-12-17Fix tuner input in the input selection cutoff.Hongguang Chen
For the tuner input, input_long_label_for_tuner will be displayed on the UI (from onBindViewHolder()). We should use it to calculate the UI size. Bug: 262824697 Test: check UI Change-Id: If3f39247aca6b1847ac2685bc658e221bf361998
2022-12-16Use Mockito 4.6.1 APISorin Basca
Bug: 236636175 Test: m TVUnitTests Test: m RunTvRoboTests Change-Id: I424015a4ec7e28c4775f7d2614d10d0958dcdb2e Merged-In: I424015a4ec7e28c4775f7d2614d10d0958dcdb2e
2022-11-03Snap for 9250849 from 833c032f396b99b691472de8d61285cf8736eb56 to udc-d1-releaseAndroid Build Coastguard Worker
Change-Id: Ib642c27bd7f4e55ef618d565756c6757c8cdf050
2022-10-28Snap for 9228056 from a33753c5c04645fdd4f17792187b1c0fc0875908 to udc-d1-releaseAndroid Build Coastguard Worker
Change-Id: I717a1ed409e3792c1521b7b7a96d178de52030b5
2022-10-27Snap for 9222825 from a33753c5c04645fdd4f17792187b1c0fc0875908 to udc-releaseAndroid Build Coastguard Worker
Change-Id: I1be34dd300f3c5c33d09cd0ae45f9852cc894d3f
2022-10-26Merge "Request audio focus on changing channel."David Zhao
2022-10-26Snap for 9218031 from c08767dca06c6b10abca77477762a4bb78055664 to udc-releaseAndroid Build Coastguard Worker
Change-Id: I83b3c5f35b97a05cce39bcc5473ee710ea6b1e9c
2022-10-26Snap for 9216859 from c08767dca06c6b10abca77477762a4bb78055664 to udc-d1-releaseAndroid Build Coastguard Worker
Change-Id: Iaa89378b039c05cbdda2ed6b889e8820d2396091
2022-10-26Request audio focus on changing channel.David Zhao
`setVolumeByAudioFocus` doesn't actually take focus back in case we lose it while in the middle of playing TV. This can happen when a TIAS requests focus while a TV program is playing. `requestAudioFocus` will attempt to grab focus from the audio manager, while also calling `setVolumeByAudioFocus` at the end. Bug: 241110408 Test: Cuttlefish Change-Id: I5df860a351554a5a5b4ac18c8693d5531c85b816
2022-10-25Snap for 9212694 from 882ef25c4dd394aa04d8ab61a9dcbe25de7e100c to udc-releaseAndroid Build Coastguard Worker
Change-Id: I2d07bfff489976692651f978a39813062e591afe
2022-10-25Snap for 9212571 from 882ef25c4dd394aa04d8ab61a9dcbe25de7e100c to udc-d1-releaseAndroid Build Coastguard Worker
Change-Id: I6a8977d83f414e4ab9e69c7127dfde8c7b29b6c2
2022-10-24Merge "Add handling for selectTrack command"David Zhao
2022-10-24Add handling for selectTrack commandDavid Zhao
Bug: 241110408 Test: Cuttlefish manually Change-Id: I9192ae99e6381998f4deba6500ee5832ba7b52ca
2022-10-20Make autoselection of audio optionalDavid Zhao
Bug: 241110408 Test: Cuttlefish manually Change-Id: Ife9777ecbb5d11cfc6dcf347c4f1862e1f6dd783
2022-10-08Snap for 9153162 from f43ec1dfbb2cf61e8f7db40dd9a14d64f62c0564 to udc-d1-releaseAndroid Build Coastguard Worker
Change-Id: I70e8b23abb0d429befd8f7a47b947c26c26dc0fe
2022-10-07Snap for 9148142 from f43ec1dfbb2cf61e8f7db40dd9a14d64f62c0564 to udc-releaseAndroid Build Coastguard Worker
Change-Id: I31e764ef65203762f89e082ed15aba852451de88
2022-10-03Prevent creation of app links to protected activitiesDavid Zhao
Change-Id: Ic22cfe8b2f75609d6cdd6ebed1ddba0961bfe30b Bug: 239416490 Test: Cuttlefish
2022-09-08Snap for 9036731 from 4418cb13d543d8cb1b7bdebfc1188ad75fa1934a to udc-d1-releaseAndroid Build Coastguard Worker
Change-Id: Icc41b27830f73d4547208199209fd9f75e63755f
2022-09-07Snap for 9033936 from 4418cb13d543d8cb1b7bdebfc1188ad75fa1934a to udc-releaseAndroid Build Coastguard Worker
Change-Id: Ic5e405cbfddb30aa31b85d666e55ced281ec3676
2022-08-30Deny epg permissions for untrusted appsqingxun
Test: Cuttlefish Bug: 240268320 Change-Id: Ia0028d04b0cb58d45fbe75d13975c7db4edf3909
2022-08-26Snap for 8995964 from 786e9115d5a99e3724d768ff535830325df975cb to udc-releaseAndroid Build Coastguard Worker
Change-Id: I16c039a3231a48bc8fe18217ac099d3d098c5039
2022-08-26Snap for 8995547 from 786e9115d5a99e3724d768ff535830325df975cb to udc-d1-releaseAndroid Build Coastguard Worker
Change-Id: I09cd4a860c985685b847b8114196162f7084f7fc
2022-08-25Merge "SampleTunerTIS Choose between Dvr and FE input"Lucas Gates
2022-08-24SampleTunerTIS Choose between Dvr and FE inputLucas Gates
Currently, the SampleTunerTIS uses a combination of frontend tuning and dvr reading to receive its input. This combination does not match real use cases and causes an incorrect state in the Tuner HAL, as described in attached bug. This CL changes the Tuner to instead use only the DVR or Frontend input depending on a static flag given at compile time. Note that with the current state of the default Tuner HAL, only DVR playback mode will result in input being fed to TIS. The inclusion of Frontend Input still serves as a valuable sample of a real use case, and can be implemented through changes to our default Tuner HAL. Bug: 239731089 Test: Manually with Cuttlefish and LiveTv Change-Id: I69ce32a9732dce664cd79381a4634e905ab5bd63
2022-08-24Snap for 8984144 from fcd174bed708437a80405f85710cd2358bd92b8a to udc-d1-releaseAndroid Build Coastguard Worker
Change-Id: I69f991fb6c2b560772c64c43205c40b56b8cfaa3
2022-08-23Snap for 8978248 from fcd174bed708437a80405f85710cd2358bd92b8a to udc-releaseAndroid Build Coastguard Worker
Change-Id: I9156e07645be9176697444115a6245a0b86701b7
2022-08-22Merge "Hide IApp settings if TIAF isn't available"David Zhao
2022-08-21Snap for 8973904 from 85cc3d104091c20d64f644c8801a7bce043390b3 to udc-releaseAndroid Build Coastguard Worker
Change-Id: Ia327f53094981a5478fbc4115b0d0f9ffa4cc7b2
2022-08-21Snap for 8973948 from 85cc3d104091c20d64f644c8801a7bce043390b3 to udc-d1-releaseAndroid Build Coastguard Worker
Change-Id: Iac30cd91ab606d9fa27f67998b332f5e2631ee14
2022-08-20Merge "Add IApp Dialog for IApp toggle"David Zhao
2022-08-20Snap for 8970787 from e73475463ca1aa43ba60e946dd90fe17f012f22f to udc-releaseAndroid Build Coastguard Worker
Change-Id: Ibba0482bd612a3a1dd88f9df87ea2764ffe13133
2022-08-20Snap for 8971197 from e73475463ca1aa43ba60e946dd90fe17f012f22f to udc-d1-releaseAndroid Build Coastguard Worker
Change-Id: Id943c67e3170de18468403c653bcabebdd94d435
2022-08-19Merge "SampleTunerTIS Correct notifyVideoAvailable use"Lucas Gates
2022-08-19Snap for 8963610 from efb72653518f8fa7a5b1d3756fac155e23eb653f to udc-d1-releaseAndroid Build Coastguard Worker
Change-Id: Ie50924f1ec7c940e6a2de6d09a1fb02d6b8b60d7
2022-08-18Snap for 8961762 from efb72653518f8fa7a5b1d3756fac155e23eb653f to udc-releaseAndroid Build Coastguard Worker
Change-Id: I7a546bb90383fc2a1850ff7a30cae9f40b1c4bfc
2022-08-18Snap for 8959612 from c92e794b5e0d69edde69171c56fb8c07d2303cb4 to udc-d1-releaseAndroid Build Coastguard Worker
Change-Id: I2bb5ee8249b28f803de64eb0ea9caa2cab2ae688
2022-08-17Hide IApp settings if TIAF isn't availableqingxun
Test: Cuttlefish Bug: 241110408 Change-Id: I9d9d2f6f7872f5874cc7ea48d2100d5cbea1e30b
2022-08-17Add IApp Dialog for IApp toggleqingxun
Bug: 241110408 Test: Cuttlefish https://screenshot.googleplex.com/72CniCMVaHvwpbR Change-Id: I21fb08d36fb08b06691b7eb36c4fa962022c86a6
2022-08-17SampleTunerTIS Correct notifyVideoAvailable useLucas Gates
The notifyVideoAvailable() function of the TIS is used to signal that the content rendered onto its surface is ready to be viewed, and must be called at least once per call to onTune(). After it is called, the manager will assume that the video is still available until notiftVideoUnavailable() is called. Our current implementation of the SampleTunerTIS calls notifyVideoAvailable() for each frame of video played. This CL changes the behavior to only call the method once per call to onTune, as well as notifying the video as unavailable while we do our setting up/tuning. Bug: 242907861 Test: Manually with Cuttlefish and LiveTv. Change-Id: I9d8d623a9b8e8fe1c3199672cfcd57599a7f572b
2022-08-17Merge changes I6e9f9065,I46406c96,I12aa5973,I1e41c5e5Lucas Gates
* changes: LiveTv TIAS Integration playbackCommandRequest LiveTv TIAS Integration ViewCallback data requests LiveTv TIAS Integration Start and stop TIAS LiveTv TIAS Integration Send AIT info to MainActivity
2022-08-17LiveTv TIAS Integration playbackCommandRequestLucas Gates
The TvInteractiveAppView.TvInteractiveAppCallback includes a playbackCommandRequest method which allows the TIAS to request changes to be made on the application running it. This CL implements all of these commands except track selection, which will be implemented in a future CL alongside changes to the audio system needed to support it. Bug: 241110408 Test: Manually with Cuttlefish and SampleTIAS Change-Id: I6e9f9065dd28dad4451150daa5fe5deb5b3b38d1
2022-08-17[automerger skipped] DO NOT MERGE - Merge Android 13 am: cf34101f37 -s ours ↵Xin Li
am: d35e95517c -s ours am: 4f45a109bf -s ours am: 2823b1be93 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/TV/+/2186789 Change-Id: I704f1643a8975ac47bc7fb115393c77415309540 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17Snap for 8955156 from df79eb31f11576ad837843ee3efad9ec97e949c3 to udc-releaseAndroid Build Coastguard Worker
Change-Id: Ie819db89d15df13b241b2b899a4f369e0bf78fb8
2022-08-16[automerger skipped] DO NOT MERGE - Merge Android 13 am: cf34101f37 -s ours ↵main-16k-with-phonesXin Li
am: d35e95517c -s ours am: 4f45a109bf -s ours am skip reason: Merged-In I424015a4ec7e28c4775f7d2614d10d0958dcdb2e with SHA-1 f8a522d2c9 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/TV/+/2186789 Change-Id: I65a6f343ecbb191f5f17c50b0d43f1c48f026365 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16[automerger skipped] DO NOT MERGE - Merge Android 13 am: cf34101f37 -s ours ↵Xin Li
am: d35e95517c -s ours am skip reason: Merged-In I424015a4ec7e28c4775f7d2614d10d0958dcdb2e with SHA-1 f8a522d2c9 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/TV/+/2186789 Change-Id: I622dbf40082059f038cb7b44366cef5585be66f3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>