From 010aa30bc459f2f1df717b0c09928a0ce366193b Mon Sep 17 00:00:00 2001 From: Michael Wright Date: Fri, 4 Feb 2022 17:12:47 +0000 Subject: [PATCH] Fix erroneous self comparison in KeyValueBackupTaskTest Bug: 217923092 Test: atest BackupFrameworksServicesRoboTests Change-Id: I73c88df39b63b40a6ed008c5e7872604a5894fbc --- services/Android.bp | 1 + .../android/server/backup/keyvalue/KeyValueBackupTaskTest.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/services/Android.bp b/services/Android.bp index b0a5c66b53dd1..c8b4969d285f2 100644 --- a/services/Android.bp +++ b/services/Android.bp @@ -16,6 +16,7 @@ java_defaults { // "-Xep:AndroidFrameworkBinderIdentity:ERROR", "-Xep:AndroidFrameworkCompatChange:ERROR", // "-Xep:AndroidFrameworkUid:ERROR", + "-Xep:SelfEquals:ERROR", // NOTE: only enable to generate local patchfiles // "-XepPatchChecks:refaster:frameworks/base/errorprone/refaster/EfficientXml.java.refaster", // "-XepPatchLocation:/tmp/refaster/", diff --git a/services/robotests/backup/src/com/android/server/backup/keyvalue/KeyValueBackupTaskTest.java b/services/robotests/backup/src/com/android/server/backup/keyvalue/KeyValueBackupTaskTest.java index 9e83f8e7bda85..ca9ff6f15f3f1 100644 --- a/services/robotests/backup/src/com/android/server/backup/keyvalue/KeyValueBackupTaskTest.java +++ b/services/robotests/backup/src/com/android/server/backup/keyvalue/KeyValueBackupTaskTest.java @@ -2727,7 +2727,7 @@ public class KeyValueBackupTaskTest { // The second line will throw NPE because it will call lambda 1 with null, since argThat() // returns null. So we guard against that by checking for null. return packageInfo -> - packageInfo != null && packageInfo.packageName.equals(packageInfo.packageName); + packageInfo != null && packageInfo.packageName.equals(packageData.packageName); } /** Matches {@link ApplicationInfo} whose package name is {@code packageData.packageName}. */