From 8369df095a73a77b3715f8ae7ba06089cebca4ce Mon Sep 17 00:00:00 2001
From: Eric Erfanian <erfanian@google.com>
Date: Wed, 3 May 2017 10:27:13 -0700
Subject: This change reflects the Dialer V10 RC00 branch.

RC00 is based on:
branch: dialer-android_release_branch/153304843.1
synced to: 153304843

following the instructions at go/dialer-aosp-release.

In this release:

* Removes final apache sources.
* Uses native lite compilation.

More drops will follow with subsequent release candidates
until we reach our final v10 release, in cadence with our
prebuilt drops.

Test: TreeHugger, on device
Change-Id: Ic9684057230f9b579c777820c746cd21bf45ec0f
---
 .../android/dialer/app/calllog/BlockReportSpamListener.java | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'java/com/android/dialer/app/calllog/BlockReportSpamListener.java')

diff --git a/java/com/android/dialer/app/calllog/BlockReportSpamListener.java b/java/com/android/dialer/app/calllog/BlockReportSpamListener.java
index 66f40bcd7..740d6b361 100644
--- a/java/com/android/dialer/app/calllog/BlockReportSpamListener.java
+++ b/java/com/android/dialer/app/calllog/BlockReportSpamListener.java
@@ -24,9 +24,10 @@ import android.support.v7.widget.RecyclerView;
 import com.android.dialer.blocking.BlockReportSpamDialogs;
 import com.android.dialer.blocking.FilteredNumberAsyncQueryHandler;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.logging.ContactSource;
+import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
-import com.android.dialer.logging.nano.DialerImpression;
-import com.android.dialer.logging.nano.ReportingLocation;
+import com.android.dialer.logging.ReportingLocation;
 import com.android.dialer.spam.Spam;
 
 /** Listener to show dialogs for block and report spam actions. */
@@ -54,7 +55,7 @@ public class BlockReportSpamListener implements CallLogListItemViewHolder.OnClic
       final String number,
       final String countryIso,
       final int callType,
-      final int contactSourceType) {
+      final ContactSource.Type contactSourceType) {
     BlockReportSpamDialogs.BlockReportSpamDialogFragment.newInstance(
             displayNumber,
             Spam.get(mContext).isDialogReportSpamCheckedByDefault(),
@@ -98,7 +99,7 @@ public class BlockReportSpamListener implements CallLogListItemViewHolder.OnClic
       final String number,
       final String countryIso,
       final int callType,
-      final int contactSourceType) {
+      final ContactSource.Type contactSourceType) {
     BlockReportSpamDialogs.BlockDialogFragment.newInstance(
             displayNumber,
             Spam.get(mContext).isSpamEnabled(),
@@ -142,7 +143,7 @@ public class BlockReportSpamListener implements CallLogListItemViewHolder.OnClic
       final String number,
       final String countryIso,
       final int callType,
-      final int contactSourceType,
+      final ContactSource.Type contactSourceType,
       final boolean isSpam,
       final Integer blockId) {
     BlockReportSpamDialogs.UnblockDialogFragment.newInstance(
@@ -185,7 +186,7 @@ public class BlockReportSpamListener implements CallLogListItemViewHolder.OnClic
       final String number,
       final String countryIso,
       final int callType,
-      final int contactSourceType) {
+      final ContactSource.Type contactSourceType) {
     BlockReportSpamDialogs.ReportNotSpamDialogFragment.newInstance(
             displayNumber,
             new BlockReportSpamDialogs.OnConfirmListener() {
-- 
cgit v1.2.3