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

Commit 46c7146b authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix errorprone warnings that should be errors"

parents dbdc67e0 6b98e508

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();

    }