From 6d663b07c4370fb3587e7462c88598b4e881c427 Mon Sep 17 00:00:00 2001
From: Henry Fang <quxiangfang@google.com>
Date: Thu, 8 Jul 2021 14:45:17 -0700
Subject: [PATCH] Add unregisterClient in instance close.

bug: 193109848
Test: atest android.media.tv.tuner.cts
Change-Id: I4e15cc482c4900d12d55a1d8527da0c41a356f88
---
 media/java/android/media/tv/tuner/Tuner.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/media/java/android/media/tv/tuner/Tuner.java b/media/java/android/media/tv/tuner/Tuner.java
index 952bbf56d5fa7..2ea745b44288f 100644
--- a/media/java/android/media/tv/tuner/Tuner.java
+++ b/media/java/android/media/tv/tuner/Tuner.java
@@ -347,7 +347,6 @@ public class Tuner implements AutoCloseable  {
             mHandler = createEventHandler();
         }
 
-        mHandler = createEventHandler();
         int[] clientId = new int[1];
         ResourceClientProfile profile = new ResourceClientProfile();
         profile.tvInputSessionId = tvInputSessionId;
@@ -516,6 +515,8 @@ public class Tuner implements AutoCloseable  {
             mDemuxHandle = null;
         }
 
+        mTunerResourceManager.unregisterClientProfile(mClientId);
+
     }
 
     /**