From 573d22a90c686319dff429ba5aab88aacf644c57 Mon Sep 17 00:00:00 2001
From: Michael Wright <michaelwr@google.com>
Date: Fri, 4 Feb 2022 21:02:33 +0000
Subject: [PATCH] Remove self-assignment from AutofillManagerService

This lets us make the errorprone warning an error, prevent erroneous
future instances.

Bug: 217923092
Test: errorprone build
Change-Id: I600ec645fafbdb550c8d3a11b6c877a32aa454fb
---
 services/Android.bp                                           | 1 +
 .../com/android/server/autofill/AutofillManagerService.java   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/services/Android.bp b/services/Android.bp
index db233e57c9445..69733c0001943 100644
--- a/services/Android.bp
+++ b/services/Android.bp
@@ -22,6 +22,7 @@ java_defaults {
             "-Xep:HashtableContains:ERROR",
             "-Xep:FormatString:ERROR",
             "-Xep:ArrayHashCode:ERROR",
+            "-Xep:SelfAssignment:ERROR",
             // NOTE: only enable to generate local patchfiles
             // "-XepPatchChecks:refaster:frameworks/base/errorprone/refaster/EfficientXml.java.refaster",
             // "-XepPatchLocation:/tmp/refaster/",
diff --git a/services/autofill/java/com/android/server/autofill/AutofillManagerService.java b/services/autofill/java/com/android/server/autofill/AutofillManagerService.java
index 051281c5dd08f..fc95cdd53f294 100644
--- a/services/autofill/java/com/android/server/autofill/AutofillManagerService.java
+++ b/services/autofill/java/com/android/server/autofill/AutofillManagerService.java
@@ -1614,8 +1614,8 @@ public final class AutofillManagerService
                 @NonNull IBinder appCallback, @NonNull IResultReceiver receiver)
                 throws RemoteException {
             final int userId = UserHandle.getCallingUserId();
-            activityToken = Objects.requireNonNull(activityToken, "activityToken");
-            appCallback = Objects.requireNonNull(appCallback, "appCallback");
+            Objects.requireNonNull(activityToken, "activityToken");
+            Objects.requireNonNull(appCallback, "appCallback");
 
             boolean restored = false;
             synchronized (mLock) {