From 9c0996d3c1ba2db75158094b47a2ca815db3faef Mon Sep 17 00:00:00 2001
From: Shan Huang <shanh@google.com>
Date: Tue, 7 Jun 2022 17:13:03 -0700
Subject: [PATCH] Fix NPE from
 BackAnimationController#setBackToLauncherCallback.

Bug: 235198537
Test: atest BackAnimationControllerTest
Change-Id: Ibb0e85ab3cb62cc4d1ab1a2da5e6f4b2a5d9e90f
---
 .../com/android/wm/shell/back/BackAnimationController.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java
index 7760df17a8cd4..0cb56d72004d9 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java
@@ -210,19 +210,19 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont
         @Override
         public void setBackToLauncherCallback(IOnBackInvokedCallback callback) {
             executeRemoteCallWithTaskPermission(mController, "setBackToLauncherCallback",
-                    (controller) -> mController.setBackToLauncherCallback(callback));
+                    (controller) -> controller.setBackToLauncherCallback(callback));
         }
 
         @Override
         public void clearBackToLauncherCallback() {
             executeRemoteCallWithTaskPermission(mController, "clearBackToLauncherCallback",
-                    (controller) -> mController.clearBackToLauncherCallback());
+                    (controller) -> controller.clearBackToLauncherCallback());
         }
 
         @Override
         public void onBackToLauncherAnimationFinished() {
             executeRemoteCallWithTaskPermission(mController, "onBackToLauncherAnimationFinished",
-                    (controller) -> mController.onBackToLauncherAnimationFinished());
+                    (controller) -> controller.onBackToLauncherAnimationFinished());
         }
 
         void invalidate() {