From 98a8b9e3df33c746da4907929da29435f9fc96d6 Mon Sep 17 00:00:00 2001
From: David Zhao <qingxun@google.com>
Date: Mon, 13 Feb 2023 16:13:34 -0800
Subject: [PATCH] Fix crash when calling sendTimeShiftMode

Bug: 269185572
Test: atest TvInteractiveAppServiceTest
Change-Id: Ia916536d2cfa3b9e1222cbf961c521d2b0b232af
---
 .../tv/interactive/ITvInteractiveAppSessionWrapper.java    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/media/java/android/media/tv/interactive/ITvInteractiveAppSessionWrapper.java b/media/java/android/media/tv/interactive/ITvInteractiveAppSessionWrapper.java
index f009ceab0a75f..8b4c1d705a91a 100644
--- a/media/java/android/media/tv/interactive/ITvInteractiveAppSessionWrapper.java
+++ b/media/java/android/media/tv/interactive/ITvInteractiveAppSessionWrapper.java
@@ -190,7 +190,9 @@ public class ITvInteractiveAppSessionWrapper
                 break;
             }
             case DO_SEND_TIME_SHIFT_MODE: {
-                mSessionImpl.sendTimeShiftMode((Integer) msg.obj);
+                SomeArgs args = (SomeArgs) msg.obj;
+                mSessionImpl.sendTimeShiftMode(args.argi1);
+                args.recycle();
                 break;
             }
             case DO_SEND_AVAILABLE_SPEEDS: {
@@ -443,8 +445,7 @@ public class ITvInteractiveAppSessionWrapper
 
     @Override
     public void sendTimeShiftMode(int mode) {
-        mCaller.executeOrSendMessage(
-                mCaller.obtainMessageI(DO_SEND_TIME_SHIFT_MODE, mode));
+        mCaller.executeOrSendMessage(mCaller.obtainMessageI(DO_SEND_TIME_SHIFT_MODE, mode));
     }
 
     @Override