diff options
| author | Szu-An <szuanlu@google.com> | 2023-06-20 16:25:03 +0800 |
|---|---|---|
| committer | Szu-An <szuanlu@google.com> | 2023-06-20 16:51:21 +0800 |
| commit | 244887ae33906645a9164e5e51b4135bf1c468dd (patch) | |
| tree | cd2479b6345da6e132d78d212c3b964a18a3e7df | |
| parent | c60919683929d77efa9b55b9fb172d9241a98beb (diff) | |
| download | TV-244887ae33906645a9164e5e51b4135bf1c468dd.tar.gz | |
Fix no response of TV input global key when all external inputs hidden
Launch input select menu even when only one available input to align
the behavior from other entry points in home and dashboard.
Fix: 286453907
Test: remote input key launches input menu when there is one input
Test: tune to a input in live tv, select menu can be launched only when
more than one input available
Change-Id: I4bb7eae488c8d556078d3ea41cdcc5afa51fdccb
| -rw-r--r-- | src/com/android/tv/TvApplication.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/com/android/tv/TvApplication.java b/src/com/android/tv/TvApplication.java index 5ab8f033..a607772f 100644 --- a/src/com/android/tv/TvApplication.java +++ b/src/com/android/tv/TvApplication.java @@ -407,9 +407,17 @@ public abstract class TvApplication extends BaseApplication implements TvSinglet ++inputCount; } } - if (inputCount < 2) { + + if (inputCount < 1) { + Log.w(TAG, "No available input to be selected."); return; } + + if (mMainActivityWrapper.isResumed() && inputCount < 2) { + // if no other inputs can be switched to, keep in the same input + return; + } + Activity activityToHandle = mMainActivityWrapper.isResumed() ? mMainActivityWrapper.getMainActivity() |