Merge "Tuner: Clean up frontend sharee resource before sharing another resource" into main

2023-08-09 21:51:39 +00:00
parent 24c9102d0f 9296d15b2c
commit abd5758e63
1 changed files with 6 additions and 0 deletions
--- a/media/java/android/media/tv/tuner/Tuner.java
+++ b/media/java/android/media/tv/tuner/Tuner.java
@@ -443,6 +443,12 @@ public class Tuner implements AutoCloseable  {
        acquireTRMSLock("shareFrontendFromTuner()");
        mFrontendLock.lock();
        try {
+            if (mFeOwnerTuner != null) {
+                // unregister self from the Frontend callback
+                mFeOwnerTuner.unregisterFrontendCallbackListener(this);
+                mFeOwnerTuner = null;
+                nativeUnshareFrontend();
+            }
            mTunerResourceManager.shareFrontend(mClientId, tuner.mClientId);
            mFeOwnerTuner = tuner;
            mFeOwnerTuner.registerFrontendCallbackListener(this);