From 78364ddc047100306f0ccacc8fdad043d9a43653 Mon Sep 17 00:00:00 2001
From: Dongwon Kang <dwkang@google.com>
Date: Tue, 16 Feb 2016 15:50:11 -0800
Subject: [PATCH] TIF: Release passthrough session when HardwareSession is
 released

Bug: https://code.google.com/p/android/issues/detail?id=200114
Change-Id: I5d74eb56297e468b95aa0f99b159b2b54f93f5d2
---
 media/java/android/media/tv/TvInputService.java | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/media/java/android/media/tv/TvInputService.java b/media/java/android/media/tv/TvInputService.java
index 16e1c5c2f64fe..da4a038321919 100644
--- a/media/java/android/media/tv/TvInputService.java
+++ b/media/java/android/media/tv/TvInputService.java
@@ -1940,6 +1940,15 @@ public abstract class TvInputService extends Service {
          * </ul>
          */
         public void onHardwareVideoUnavailable(int reason) { }
+
+        @Override
+        void release() {
+            if (mHardwareSession != null) {
+                mHardwareSession.release();
+                mHardwareSession = null;
+            }
+            super.release();
+        }
     }
 
     /** @hide */