From 9c22862f716ddb3748e4b33f4a03e876a1b0a873 Mon Sep 17 00:00:00 2001
From: Shen Lin <shhenlin@gmail.com>
Date: Mon, 19 Dec 2022 15:11:41 +0800
Subject: [PATCH] Align passing member references to do nativeInit

Since mInputChannel is written before, we should also pass its reference
like we did with mMessageQueue to nativeInit() to init InputChannel.

Test: atest InputEventSenderAndReceiverTest
Change-Id: I99255eb54fa5332f9051fb4d0de663446ef43bf9
---
 core/java/android/view/InputEventReceiver.java | 2 +-
 core/java/android/view/InputEventSender.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/java/android/view/InputEventReceiver.java b/core/java/android/view/InputEventReceiver.java
index a24c1f95b0c09..492c9384a9692 100644
--- a/core/java/android/view/InputEventReceiver.java
+++ b/core/java/android/view/InputEventReceiver.java
@@ -77,7 +77,7 @@ public abstract class InputEventReceiver {
         mInputChannel = inputChannel;
         mMessageQueue = looper.getQueue();
         mReceiverPtr = nativeInit(new WeakReference<InputEventReceiver>(this),
-                inputChannel, mMessageQueue);
+                mInputChannel, mMessageQueue);
 
         mCloseGuard.open("InputEventReceiver.dispose");
     }
diff --git a/core/java/android/view/InputEventSender.java b/core/java/android/view/InputEventSender.java
index 9035f3f7a0d4c..64f62c75199ea 100644
--- a/core/java/android/view/InputEventSender.java
+++ b/core/java/android/view/InputEventSender.java
@@ -65,7 +65,7 @@ public abstract class InputEventSender {
         mInputChannel = inputChannel;
         mMessageQueue = looper.getQueue();
         mSenderPtr = nativeInit(new WeakReference<InputEventSender>(this),
-                inputChannel, mMessageQueue);
+                mInputChannel, mMessageQueue);
 
         mCloseGuard.open("InputEventSender.dispose");
     }