summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author xiaotonj <xiaotonj@google.com> 2023-11-22 09:59:26 -0800
committer Grace Jia <xiaotonj@google.com> 2023-11-22 18:56:44 +0000
commit8d552499390567a09e8a7ec104c7cbbf24e4af90 (patch)
tree2fe48edc02af3cb0fa6ea61979a8b756df8a8f0a
parent3fc4d3967e6f74ee11bafb1cde34b2ea4ba21d99 (diff)
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
-rw-r--r--telecomm/java/android/telecom/Call.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/telecomm/java/android/telecom/Call.java b/telecomm/java/android/telecom/Call.java
index c152a41c8694..25bd14f63573 100644
--- a/telecomm/java/android/telecom/Call.java
+++ b/telecomm/java/android/telecom/Call.java
@@ -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;