Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74faa3ff authored by Michael Wright's avatar Michael Wright Committed by Android (Google) Code Review
Browse files

Merge "Fix erroneous self comparison in KeyValueBackupTaskTest"

parents 1051bbbd 010aa30b

services/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -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/",

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

+1 −1
Original line number Diff line number Diff line
@@ -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}. */