Merge "Fix Error Prone ArrayEquals/ArrayHashCode bugs" into oc-dev (69bf3ea8) · Commits · e / os / android_frameworks_base

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