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

Commit bab3b938 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Support comparison of byte array values in areBundlesEqual" into tm-dev... 

Merge "Support comparison of byte array values in areBundlesEqual" into tm-dev am: 548c0800 am: bb5b8247

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18357438



Change-Id: Id836c0cd45de37dfe140a246895afa04ce33bb5b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0a4b075c bb5b8247

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;

                }

            }