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

Commit 8d552499 authored by xiaotonj's avatar xiaotonj Committed by Grace Jia
Browse files

DO NOT MERGE 

Fix areBundleEqual in Call.

Currently the sentence in areBundleEqual arranged in a wrong order.
Fixed this by moving the check sentence before the actual query
sentence.

Bug: b/312604549
Test: cts call tests
Change-Id: Id8caa5719b4df724cbe03edd75b99a2b2e3882b5
parent 3fc4d396

telecomm/java/android/telecom/Call.java

+2 −2
Original line number Diff line number Diff line
@@ -2951,11 +2951,11 @@ public final class Call { 


        for(String key : bundle.keySet()) {

            if (key != null) {

                final Object value = bundle.get(key);

                final Object newValue = newBundle.get(key);

                if (!newBundle.containsKey(key)) {

                    return false;

                }

                final Object value = bundle.get(key);

                final Object newValue = newBundle.get(key);

                if (value instanceof Bundle && newValue instanceof Bundle) {

                    if (!areBundlesEqual((Bundle) value, (Bundle) newValue)) {

                        return false;