Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "TIF: Use the right size for calls to toArray() instead of 0" into mnc-dev

Browse Source
This commit is contained in:
Jae Seo
2015-06-21 23:00:09 +00:00
committed by Android (Google) Code Review
parent a5103b9b52 93ff14b7a5
commit 392f2d3b5d
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/tv/TvInputHardwareManager.java
View File

@@ -900,7 +900,7 @@ class TvInputHardwareManager implements TvInputHal.Callback {
mAudioManager.createAudioPatch( mAudioManager.createAudioPatch(
audioPatchArray, audioPatchArray,
new AudioPortConfig[] { sourceConfig }, new AudioPortConfig[] { sourceConfig },
sinkConfigs.toArray(new AudioPortConfig[0])); sinkConfigs.toArray(new AudioPortConfig[sinkConfigs.size()]));
mAudioPatch = audioPatchArray[0]; mAudioPatch = audioPatchArray[0];
if (sourceGainConfig != null) { if (sourceGainConfig != null) {
mAudioManager.setAudioPortGain(mAudioSource, sourceGainConfig); mAudioManager.setAudioPortGain(mAudioSource, sourceGainConfig);

5
services/core/java/com/android/server/tv/TvInputManagerService.java
View File

@@ -1658,10 +1658,9 @@ public final class TvInputManagerService extends SystemService {
UserState userState = getUserStateLocked(resolvedUserId); UserState userState = getUserStateLocked(resolvedUserId);
if (userState.sessionStateMap.size() == 1) { if (userState.sessionStateMap.size() == 1) {
return true; return true;
} } else if (userState.sessionStateMap.size() == 2) {
else if (userState.sessionStateMap.size() == 2) {
SessionState[] sessionStates = userState.sessionStateMap.values().toArray( SessionState[] sessionStates = userState.sessionStateMap.values().toArray(
new SessionState[0]); new SessionState[2]);
// Check if there is a wrapper input. // Check if there is a wrapper input.
if (sessionStates[0].hardwareSessionToken != null if (sessionStates[0].hardwareSessionToken != null
|| sessionStates[1].hardwareSessionToken != null) { || sessionStates[1].hardwareSessionToken != null) {