From bed9c323eef2ebcbc422277df2210cd021ca41e3 Mon Sep 17 00:00:00 2001
From: David Zhao <qingxun@google.com>
Date: Fri, 17 Feb 2023 14:32:38 -0800
Subject: [PATCH] Use obtainMessageO for sendTimeShiftMode

It seems the obtainMessageI doesn't work for single argument results for some reason. Using obtainMessageO is more consistent with the rest of the implementations anyway. This fixes a crash when trying to access the args, which are null.

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

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