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

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

Merge changes I600ec645,Idfcc220d 

* changes:
  Remove self-assignment from AutofillManagerService
  Use Arrays.hashCode in EventIndex hashCode()
parents 370b27ad 573d22a9

services/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ java_defaults { 
            "-Xep:TryFailThrowable:ERROR",

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

services/autofill/java/com/android/server/autofill/AutofillManagerService.java

+2 −2
Original line number Diff line number Diff line
@@ -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) {

services/people/java/com/android/server/people/data/EventIndex.java

+1 −1
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ public class EventIndex { 


    @Override

    public int hashCode() {

        return Objects.hash(mLastUpdatedTime, mEventBitmaps);

        return Objects.hash(mLastUpdatedTime, Arrays.hashCode(mEventBitmaps));

    }



    synchronized void writeToProto(@NonNull ProtoOutputStream protoOutputStream) {