summaryrefslogtreecommitdiff
path: root/java/com/android/incallui/call/CallList.java
diff options
context:
space:
mode:
authorEric Erfanian <erfanian@google.com>2017-05-03 23:18:35 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-05-03 23:18:35 +0000
commit2034759538273aed8a0b412d8fb90994eba1f7ea (patch)
tree1a45d60921e293c6088efeaf4d9c408456f3e0e2 /java/com/android/incallui/call/CallList.java
parent86baedee44a4902097310c689ee3ae7f0cdb1c8d (diff)
parentd67f1627521b174f12e0c247f154c7c93c5e408e (diff)
This change reflects the Dialer V10 RC00 branch. am: 8369df095a
am: d67f162752 Change-Id: I94f923a6a8af0a580723017002922e299bd335f3
Diffstat (limited to 'java/com/android/incallui/call/CallList.java')
-rw-r--r--java/com/android/incallui/call/CallList.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/java/com/android/incallui/call/CallList.java b/java/com/android/incallui/call/CallList.java
index ab2feba3e..26fd926d1 100644
--- a/java/com/android/incallui/call/CallList.java
+++ b/java/com/android/incallui/call/CallList.java
@@ -33,8 +33,8 @@ import com.android.dialer.blocking.FilteredNumberAsyncQueryHandler;
import com.android.dialer.blocking.FilteredNumbersUtil;
import com.android.dialer.common.Assert;
import com.android.dialer.common.LogUtil;
+import com.android.dialer.logging.DialerImpression;
import com.android.dialer.logging.Logger;
-import com.android.dialer.logging.nano.DialerImpression;
import com.android.dialer.shortcuts.ShortcutUsageReporter;
import com.android.dialer.spam.Spam;
import com.android.dialer.spam.SpamBindings;
@@ -198,7 +198,7 @@ public class CallList implements DialerCallDelegate {
private void logSecondIncomingCall(@NonNull Context context, @NonNull DialerCall incomingCall) {
DialerCall firstCall = getFirstCall();
if (firstCall != null) {
- int impression = 0;
+ DialerImpression.Type impression;
if (firstCall.isVideoCall()) {
if (incomingCall.isVideoCall()) {
impression = DialerImpression.Type.VIDEO_CALL_WITH_INCOMING_VIDEO_CALL;
@@ -212,7 +212,7 @@ public class CallList implements DialerCallDelegate {
impression = DialerImpression.Type.VOICE_CALL_WITH_INCOMING_VOICE_CALL;
}
}
- Assert.checkArgument(impression != 0);
+ Assert.checkArgument(impression != null);
Logger.get(context)
.logCallImpression(
impression, incomingCall.getUniqueCallId(), incomingCall.getTimeAddedMs());