Merge "TIF: Release passthrough session when HardwareSession is released" into nyc-dev

2016-02-17 19:27:58 +00:00
parent c265117881 78364ddc04
commit 37f3488c5c
1 changed files with 9 additions and 0 deletions
--- 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 */