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

Commit c67663cb authored by Paul Duffin's avatar Paul Duffin Committed by Narayan Kamath
Browse files

Fix Error Prone ArrayEquals/ArrayHashCode bugs 

This will change behavior so it could break tests but
if it does it is because they relied on broken behavior.

Someone on the frameworks team will need to verify the
correctness of these changes and fix any knock on effects.

See the following for a description of the bugs:
* http://errorprone.info/bugpattern/ArrayEquals
* http://errorprone.info/bugpattern/ArrayHashCode

Fixed automatically by Error Prone apart from manual
changes to fix up the formatting (Error Prone expects
google-java-format) and to change Object.deepEquals to
Arrays.equals for consistency with Arrays.hashCode.

Test: make checkbuild
Change-Id: I1528b795b77a4f1e0c4e7e66ad4f924b7a7606f6
parent 4566518f

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);