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

Commit 1128bb42 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: 70b9ba37 am: 5baf5662

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



Change-Id: Icb563720900d3f53340302d9b956aa71aede8242
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d0e83934 5baf5662

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;

                }

            }