From 8369df095a73a77b3715f8ae7ba06089cebca4ce Mon Sep 17 00:00:00 2001 From: Eric Erfanian 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 --- java/com/android/incallui/spam/SpamNotificationService.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'java/com/android/incallui/spam/SpamNotificationService.java') diff --git a/java/com/android/incallui/spam/SpamNotificationService.java b/java/com/android/incallui/spam/SpamNotificationService.java index bf107f789..dbea2cc38 100644 --- a/java/com/android/incallui/spam/SpamNotificationService.java +++ b/java/com/android/incallui/spam/SpamNotificationService.java @@ -26,9 +26,10 @@ import android.support.annotation.Nullable; import com.android.contacts.common.GeoUtil; import com.android.dialer.blocking.FilteredNumberAsyncQueryHandler; import com.android.dialer.common.LogUtil; +import com.android.dialer.logging.ContactLookupResult; +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; import com.android.incallui.call.DialerCall; @@ -81,7 +82,8 @@ public class SpamNotificationService extends Service { String number = intent.getStringExtra(EXTRA_PHONE_NUMBER); int notificationId = intent.getIntExtra(EXTRA_NOTIFICATION_ID, 1); String countryIso = GeoUtil.getCurrentCountryIso(this); - int contactLookupResultType = intent.getIntExtra(EXTRA_CONTACT_LOOKUP_RESULT_TYPE, 0); + ContactLookupResult.Type contactLookupResultType = + ContactLookupResult.Type.forNumber(intent.getIntExtra(EXTRA_CONTACT_LOOKUP_RESULT_TYPE, 0)); ((NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE)) .cancel(number, notificationId); @@ -110,6 +112,7 @@ public class SpamNotificationService extends Service { ReportingLocation.Type.FEEDBACK_PROMPT, contactLookupResultType); break; + default: // fall out } // TODO: call stopSelf() after async tasks complete (b/28441936) stopSelf(); @@ -122,7 +125,7 @@ public class SpamNotificationService extends Service { LogUtil.d(TAG, "onDestroy"); } - private void logCallImpression(Intent intent, int impression) { + private void logCallImpression(Intent intent, DialerImpression.Type impression) { Logger.get(this) .logCallImpression( impression, -- cgit v1.2.3