diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-10-21 00:01:34 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-10-21 00:01:34 +0000 |
| commit | 143c3cdd30556599e80b42785f8d7a56deba9851 (patch) | |
| tree | 47fde9300bbbb46e244758f4bf5508c4c34683d7 | |
| parent | d1f3ef4ff451e8b2352471b0097607d12f855911 (diff) | |
| parent | be183c08890800a317387a39136757d04094bb5f (diff) | |
| download | Dialer-143c3cdd30556599e80b42785f8d7a56deba9851.tar.gz | |
Merge "Fix errorprone warnings that should be errors" am: 46c7146be5 am: 78b832047b am: be183c0889
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Dialer/+/2256750
Change-Id: I2348c18d29ccf42fd48fcb7c0a23403059db249a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
3 files changed, 5 insertions, 5 deletions
diff --git a/java/com/android/contacts/common/model/dataitem/ImDataItem.java b/java/com/android/contacts/common/model/dataitem/ImDataItem.java index 16b9fd094..b9902551b 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.Email; 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 @@ public class ImDataItem extends DataItem { 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())) { diff --git a/java/com/android/dialer/callintent/CallIntent.java b/java/com/android/dialer/callintent/CallIntent.java index ef7aff672..183eb16e7 100644 --- a/java/com/android/dialer/callintent/CallIntent.java +++ b/java/com/android/dialer/callintent/CallIntent.java @@ -152,8 +152,7 @@ public abstract class CallIntent implements Parcelable { .setTimeSinceFirstClick(PerformanceReport.getTimeSinceFirstClick()) .addAllUiActionsSinceAppLaunch(PerformanceReport.getActions()) .addAllUiActionTimestampsSinceAppLaunch(PerformanceReport.getActionTimestamps()) - .setStartingTabIndex(PerformanceReport.getStartingTabIndex()) - .build(); + .setStartingTabIndex(PerformanceReport.getStartingTabIndex()); PerformanceReport.stopRecording(); } diff --git a/java/com/android/dialer/callintent/CallIntentBuilder.java b/java/com/android/dialer/callintent/CallIntentBuilder.java index 7cc589123..b7f7d76a9 100644 --- a/java/com/android/dialer/callintent/CallIntentBuilder.java +++ b/java/com/android/dialer/callintent/CallIntentBuilder.java @@ -77,8 +77,7 @@ public class CallIntentBuilder implements Parcelable { .setTimeSinceFirstClick(PerformanceReport.getTimeSinceFirstClick()) .addAllUiActionsSinceAppLaunch(PerformanceReport.getActions()) .addAllUiActionTimestampsSinceAppLaunch(PerformanceReport.getActionTimestamps()) - .setStartingTabIndex(PerformanceReport.getStartingTabIndex()) - .build(); + .setStartingTabIndex(PerformanceReport.getStartingTabIndex()); PerformanceReport.stopRecording(); } |