From c12afe26997b6c4ad9ce8bccdd92228a15886b6c Mon Sep 17 00:00:00 2001 From: sail Date: Thu, 17 Aug 2017 08:17:46 -0700 Subject: Fix retrieving contact lookup type in SpamNotificationService Copying contact lookup type didn't work in SpamNotificationService. The problem was that when we switched to proto lite we didn't convert the contact lookup result from an enum to an int. Bug: 62937258,64390178 Test: None PiperOrigin-RevId: 165580330 Change-Id: I455bda35125644884a7af9c452439a0dac800d70 --- java/com/android/dialer/blocking/FilteredNumberAsyncQueryHandler.java | 4 +++- java/com/android/incallui/spam/SpamNotificationService.java | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'java') diff --git a/java/com/android/dialer/blocking/FilteredNumberAsyncQueryHandler.java b/java/com/android/dialer/blocking/FilteredNumberAsyncQueryHandler.java index d806a8303..62bb9f39b 100644 --- a/java/com/android/dialer/blocking/FilteredNumberAsyncQueryHandler.java +++ b/java/com/android/dialer/blocking/FilteredNumberAsyncQueryHandler.java @@ -297,7 +297,9 @@ public class FilteredNumberAsyncQueryHandler extends AsyncQueryHandler { public void blockNumber(final OnBlockNumberListener listener, ContentValues values) { blockedNumberCache.clear(); if (!FilteredNumberCompat.canAttemptBlockOperations(context)) { - listener.onBlockComplete(null); + if (listener != null) { + listener.onBlockComplete(null); + } return; } startInsert( diff --git a/java/com/android/incallui/spam/SpamNotificationService.java b/java/com/android/incallui/spam/SpamNotificationService.java index c92d61609..91377db83 100644 --- a/java/com/android/incallui/spam/SpamNotificationService.java +++ b/java/com/android/incallui/spam/SpamNotificationService.java @@ -61,7 +61,8 @@ public class SpamNotificationService extends Service { intent.putExtra(EXTRA_CALL_START_TIME_MILLIS, call.getTimeAddedMs()); intent.putExtra(EXTRA_NOTIFICATION_TAG, notificationTag); intent.putExtra(EXTRA_NOTIFICATION_ID, notificationId); - intent.putExtra(EXTRA_CONTACT_LOOKUP_RESULT_TYPE, call.getLogState().contactLookupResult); + intent.putExtra( + EXTRA_CONTACT_LOOKUP_RESULT_TYPE, call.getLogState().contactLookupResult.getNumber()); return intent; } -- cgit v1.2.3