commit 56c038e8a339ea4d912f5fe672a6448e14c51d59
author David Zhao <qingxun@google.com> Thu Feb 16 19:44:09 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 16 19:44:09 2023 +0000
tree 8abb7dd82bd78d3912e32fc6adc33b23910e6607
parent fbef74b365f26a2dafb2e772b606ef0b9bc8af2d
parent 98a8b9e3df33c746da4907929da29435f9fc96d6

Merge "Fix crash when calling sendTimeShiftMode"

media/java/android/media/tv/interactive/ITvInteractiveAppSessionWrapper.java

diff --git a/media/java/android/media/tv/interactive/ITvInteractiveAppSessionWrapper.java b/media/java/android/media/tv/interactive/ITvInteractiveAppSessionWrapper.java
index ba30e79..afc2bb1 100644
--- a/media/java/android/media/tv/interactive/ITvInteractiveAppSessionWrapper.java
+++ b/media/java/android/media/tv/interactive/ITvInteractiveAppSessionWrapper.java
@@ -190,7 +190,9 @@
                 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: {
@@ -445,8 +447,7 @@
 
     @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