| author | Can Cao <can.cao@amlogic.com> | 2018-08-14 10:31:36 (GMT) |
|---|---|---|
| committer | Gerrit Code Review <gituser@droid04> | 2018-08-14 10:31:36 (GMT) |
| commit | d983a94d2ee83d862bcf31592b060076692d74b5 (patch) | |
| tree | 5b07775493e7717ef7a94066e9ebbfe5057a5430 | |
| parent | 3eb65b2b0323527ae61ea393a993cb43107ceb6b (diff) | |
| parent | e7b417ed0a203d17db071aa5116e1eb991656795 (diff) | |
| download | ampere-p-amlogic.zip ampere-p-amlogic.tar.gz ampere-p-amlogic.tar.bz2 | |
Merge "tvinput:send videoUnavailable for cts [1/1]" into p-amlogic
3 files changed, 12 insertions, 4 deletions
diff --git a/apps/TvInput/DroidLogicTvInput/src/com/droidlogic/tvinput/services/AUXInputService.java b/apps/TvInput/DroidLogicTvInput/src/com/droidlogic/tvinput/services/AUXInputService.java index 0326c26..7eecd94 100644 --- a/apps/TvInput/DroidLogicTvInput/src/com/droidlogic/tvinput/services/AUXInputService.java +++ b/apps/TvInput/DroidLogicTvInput/src/com/droidlogic/tvinput/services/AUXInputService.java @@ -135,8 +135,8 @@ public class AUXInputService extends DroidLogicTvInputService { AUXInputSession session = sessionMap.get(sessionId); if (session != null) { mCurrentChannel = mTvDataBaseManager.getChannelInfo(uri); - Log.d(TAG, "mCurrentChannel:"+mCurrentChannel); - // session.checkContentBlockNeeded(mCurrentChannel); + //notifyVideoUnavailable for cts test + session.notifyVideoUnavailable(TvInputManager.VIDEO_UNAVAILABLE_REASON_AUDIO_ONLY); } } } diff --git a/apps/TvInput/DroidLogicTvInput/src/com/droidlogic/tvinput/services/ArcInputService.java b/apps/TvInput/DroidLogicTvInput/src/com/droidlogic/tvinput/services/ArcInputService.java index d750a6d..0d566e9 100644 --- a/apps/TvInput/DroidLogicTvInput/src/com/droidlogic/tvinput/services/ArcInputService.java +++ b/apps/TvInput/DroidLogicTvInput/src/com/droidlogic/tvinput/services/ArcInputService.java @@ -24,6 +24,7 @@ import java.util.Map; import android.view.Surface; import android.net.Uri; import android.media.AudioManager; +import android.media.tv.TvInputManager; public class ArcInputService extends DroidLogicTvInputService { private static final String TAG = ArcInputService.class.getSimpleName();; @@ -68,8 +69,11 @@ public class ArcInputService extends DroidLogicTvInputService { Utils.logd(TAG, "doTuneFinish,result:"+result+"sessionId:"+sessionId); if (result == ACTION_SUCCESS) { ArcInputSession session = sessionMap.get(sessionId); - if (session != null) + if (session != null) { mAudioManager.setParameters("spdifin/arcin switch=1"); + //notifyVideoUnavailable for cts test + session.notifyVideoUnavailable(TvInputManager.VIDEO_UNAVAILABLE_REASON_AUDIO_ONLY); + } } } diff --git a/apps/TvInput/DroidLogicTvInput/src/com/droidlogic/tvinput/services/SPDIFInputService.java b/apps/TvInput/DroidLogicTvInput/src/com/droidlogic/tvinput/services/SPDIFInputService.java index 4c7e4e3..52b4b54 100644 --- a/apps/TvInput/DroidLogicTvInput/src/com/droidlogic/tvinput/services/SPDIFInputService.java +++ b/apps/TvInput/DroidLogicTvInput/src/com/droidlogic/tvinput/services/SPDIFInputService.java @@ -24,6 +24,7 @@ import java.util.Map; import android.view.Surface; import android.net.Uri; import android.media.AudioManager; +import android.media.tv.TvInputManager; public class SPDIFInputService extends DroidLogicTvInputService { private static final String TAG = SPDIFInputService.class.getSimpleName();; @@ -70,8 +71,11 @@ public class SPDIFInputService extends DroidLogicTvInputService { Utils.logd(TAG, "doTuneFinish,result:"+result+"sessionId:"+sessionId); if (result == ACTION_SUCCESS) { SPDIFInputSession session = sessionMap.get(sessionId); - if (session != null) + if (session != null) { mAudioManager.setParameters("spdifin/arcin switch=0"); + //notifyVideoUnavailable for cts test + session.notifyVideoUnavailable(TvInputManager.VIDEO_UNAVAILABLE_REASON_AUDIO_ONLY); + } } } |