Merge "Get session callback for tests" into udc-dev

media/java/android/media/tv/TvRecordingClient.java

@@ -396,6 +396,12 @@ public class TvRecordingClient {
         }
     }
 
+    // For testing purposes only.
+    /** @hide */
+    public TvInputManager.SessionCallback getSessionCallback() {
+        return mSessionCallback;
+    }
+
     /**
      * Callback used to receive various status updates on the
      * {@link android.media.tv.TvInputService.RecordingSession}

services/core/java/com/android/server/tv/interactive/TvInteractiveAppManagerService.java

@@ -2340,6 +2340,10 @@ public class TvInteractiveAppManagerService extends SystemService {
 
         @Override
         public void binderDied() {
+            synchronized (mLock) {
+                mSession = null;
+                clearSessionAndNotifyClientLocked(this);
+            }
         }
     }