From 7a40f70c4ac998a7798fdccfe50f509dbf3d3e4e Mon Sep 17 00:00:00 2001 From: "Kyeongkab.Nam" Date: Fri, 1 Feb 2019 11:51:02 +0900 Subject: [PATCH] Fix the wrong assignment the format value is erroneously assigned to sinkChannelMask. Therefore, it modify to assign the format value to sinkFormat. Test: manual Change-Id: Iaa2f2cef0f1448a432279483b23e0057ae3ed381 --- services/core/java/com/android/server/tv/TvInputHardwareManager.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) mode change 100644 => 100755 services/core/java/com/android/server/tv/TvInputHardwareManager.java diff --git a/services/core/java/com/android/server/tv/TvInputHardwareManager.java b/services/core/java/com/android/server/tv/TvInputHardwareManager.java old mode 100644 new mode 100755 index c1607e94dd1e..f08e58579975 --- a/services/core/java/com/android/server/tv/TvInputHardwareManager.java +++ b/services/core/java/com/android/server/tv/TvInputHardwareManager.java @@ -24,7 +24,6 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; -import android.content.pm.PackageManager; import android.hardware.hdmi.HdmiControlManager; import android.hardware.hdmi.HdmiDeviceInfo; import android.hardware.hdmi.HdmiHotplugEvent; @@ -46,7 +45,6 @@ import android.media.tv.ITvInputHardwareCallback; import android.media.tv.TvInputHardwareInfo; import android.media.tv.TvInputInfo; import android.media.tv.TvStreamConfig; -import android.os.Binder; import android.os.Handler; import android.os.IBinder; import android.os.Message; @@ -56,7 +54,6 @@ import android.util.ArrayMap; import android.util.Slog; import android.util.SparseArray; import android.util.SparseBooleanArray; -import android.view.KeyEvent; import android.view.Surface; import com.android.internal.util.DumpUtils; @@ -943,7 +940,7 @@ class TvInputHardwareManager implements TvInputHal.Callback { sinkChannelMask = sinkConfig.channelMask(); } if (sinkFormat == AudioFormat.ENCODING_DEFAULT) { - sinkChannelMask = sinkConfig.format(); + sinkFormat = sinkConfig.format(); } } -- 2.11.0