Merge "Support comparison of byte array values in areBundlesEqual" into tm-dev (548c0800) · Commits · e / os / android_frameworks_base

telecomm/java/android/telecom/Call.java

+13 −1

Original line number	Diff line number	Diff line
		@@ -2895,7 +2895,19 @@ public final class Call {
		if (key != null) {
		final Object value = bundle.get(key);
		final Object newValue = newBundle.get(key);
		if (!Objects.equals(value, newValue)) {
		if (!newBundle.containsKey(key)) {
		return false;
		}
		if (value instanceof Bundle && newValue instanceof Bundle) {
		if (!areBundlesEqual((Bundle) value, (Bundle) newValue)) {
		return false;
		}
		}
		if (value instanceof byte[] && newValue instanceof byte[]) {
		if (!Arrays.equals((byte[]) value, (byte[]) newValue)) {
		return false;
		}
		} else if (!Objects.equals(value, newValue)) {
		return false;
		}
		}