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

Commit 143c3cdd authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix errorprone warnings that should be errors" am: 46c7146b am: 78b83204 am: be183c08 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Dialer/+/2256750



Change-Id: I2348c18d29ccf42fd48fcb7c0a23403059db249a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d1f3ef4f be183c08

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

+3 −1
Original line number Diff line number Diff line
@@ -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())) {

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

+1 −2
Original line number Diff line number Diff line
@@ -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();

      }

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

+1 −2
Original line number Diff line number Diff line
@@ -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();

    }