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

Commit 849c2130 authored by Paul Duffin's avatar Paul Duffin Committed by android-build-merger
Browse files

Merge "Fix Error Prone ArrayEquals/ArrayHashCode bugs" into oc-dev am: 69bf3ea8 

am: 27c0596f

Change-Id: I690196a85d42b7f56b54e71e2df2d96f93fa323f
parents b562e539 27c0596f

core/java/android/app/job/JobInfo.java

+23 −22
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import android.util.Log; 
import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.Objects;



/**
@@ -501,7 +502,7 @@ public class JobInfo implements Parcelable { 
        if (constraintFlags != j.constraintFlags) {

            return false;

        }

        if (!Objects.deepEquals(triggerContentUris, j.triggerContentUris)) {

        if (!Arrays.equals(triggerContentUris, j.triggerContentUris)) {

            return false;

        }

        if (triggerContentUpdateDelay != j.triggerContentUpdateDelay) {
@@ -570,7 +571,7 @@ public class JobInfo implements Parcelable { 
        }

        hashCode = 31 * hashCode + constraintFlags;

        if (triggerContentUris != null) {

            hashCode = 31*hashCode + triggerContentUris.hashCode();

            hashCode = 31 * hashCode + Arrays.hashCode(triggerContentUris);

        }

        hashCode = 31 * hashCode + Long.hashCode(triggerContentUpdateDelay);

        hashCode = 31 * hashCode + Long.hashCode(triggerContentMaxDelay);