commit 9f298b7f63da5d27649f5f92da274041ee78c752
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Oct 22 03:25:16 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Oct 22 03:25:16 2022 +0000
tree 47fde9300bbbb46e244758f4bf5508c4c34683d7
parent aefabf4c15ace8642fa4963f8ea65763ab691175
parent 143c3cdd30556599e80b42785f8d7a56deba9851

Snap for 9206826 from 143c3cdd30556599e80b42785f8d7a56deba9851 to udc-d1-release

Change-Id: I74e2b57715a75ed21b582f56c5f529590836431b

java/com/android/contacts/common/model/dataitem/ImDataItem.java

diff --git a/java/com/android/contacts/common/model/dataitem/ImDataItem.java b/java/com/android/contacts/common/model/dataitem/ImDataItem.java
index 16b9fd0..b990255 100644
--- a/java/com/android/contacts/common/model/dataitem/ImDataItem.java
+++ b/java/com/android/contacts/common/model/dataitem/ImDataItem.java
@@ -22,6 +22,8 @@
 import android.provider.ContactsContract.CommonDataKinds.Im;
 import android.text.TextUtils;
 
+import java.util.Objects;
+
 /**
  * Represents an IM data item, wrapping the columns in {@link ContactsContract.CommonDataKinds.Im}.
  */
@@ -97,7 +99,7 @@
         return that.getProtocol() == Im.PROTOCOL_CUSTOM;
       }
       return true;
-    } else if (getProtocol() != that.getProtocol()) {
+    } else if (!Objects.equals(getProtocol(), that.getProtocol())) {
       return false;
     } else if (getProtocol() == Im.PROTOCOL_CUSTOM
         && !TextUtils.equals(getCustomProtocol(), that.getCustomProtocol())) {

java/com/android/dialer/callintent/CallIntent.java

diff --git a/java/com/android/dialer/callintent/CallIntent.java b/java/com/android/dialer/callintent/CallIntent.java
index ef7aff6..183eb16 100644
--- a/java/com/android/dialer/callintent/CallIntent.java
+++ b/java/com/android/dialer/callintent/CallIntent.java
@@ -152,8 +152,7 @@
             .setTimeSinceFirstClick(PerformanceReport.getTimeSinceFirstClick())
             .addAllUiActionsSinceAppLaunch(PerformanceReport.getActions())
             .addAllUiActionTimestampsSinceAppLaunch(PerformanceReport.getActionTimestamps())
-            .setStartingTabIndex(PerformanceReport.getStartingTabIndex())
-            .build();
+            .setStartingTabIndex(PerformanceReport.getStartingTabIndex());
         PerformanceReport.stopRecording();
       }
 

java/com/android/dialer/callintent/CallIntentBuilder.java

diff --git a/java/com/android/dialer/callintent/CallIntentBuilder.java b/java/com/android/dialer/callintent/CallIntentBuilder.java
index 7cc5891..b7f7d76 100644
--- a/java/com/android/dialer/callintent/CallIntentBuilder.java
+++ b/java/com/android/dialer/callintent/CallIntentBuilder.java
@@ -77,8 +77,7 @@
           .setTimeSinceFirstClick(PerformanceReport.getTimeSinceFirstClick())
           .addAllUiActionsSinceAppLaunch(PerformanceReport.getActions())
           .addAllUiActionTimestampsSinceAppLaunch(PerformanceReport.getActionTimestamps())
-          .setStartingTabIndex(PerformanceReport.getStartingTabIndex())
-          .build();
+          .setStartingTabIndex(PerformanceReport.getStartingTabIndex());
       PerformanceReport.stopRecording();
     }