Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix erroneous self comparison in KeyValueBackupTaskTest"

Browse Source
This commit is contained in:
Michael Wright
2022-02-07 12:05:58 +00:00
committed by Android (Google) Code Review
parent 1051bbbd1f 010aa30bc4
commit 74faa3ffc5
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
services/Android.bp
View File

@@ -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/",

2
services/robotests/backup/src/com/android/server/backup/keyvalue/KeyValueBackupTaskTest.java
View File

@@ -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}. */