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 --- .../incallui/spam/SpamCallListListener.java | 4 +-- .../incallui/spam/SpamNotificationActivity.java | 38 ++++++++++++++-------- .../incallui/spam/SpamNotificationService.java | 11 ++++--- 3 files changed, 33 insertions(+), 20 deletions(-) (limited to 'java/com/android/incallui/spam') diff --git a/java/com/android/incallui/spam/SpamCallListListener.java b/java/com/android/incallui/spam/SpamCallListListener.java index ed0a99e2a..67dec93ad 100644 --- a/java/com/android/incallui/spam/SpamCallListListener.java +++ b/java/com/android/incallui/spam/SpamCallListListener.java @@ -31,9 +31,9 @@ import com.android.contacts.common.compat.PhoneNumberUtilsCompat; import com.android.dialer.blocking.FilteredNumberCompat; import com.android.dialer.blocking.FilteredNumbersUtil; 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.ContactLookupResult; -import com.android.dialer.logging.nano.DialerImpression; import com.android.dialer.notification.NotificationChannelManager; import com.android.dialer.notification.NotificationChannelManager.Channel; import com.android.dialer.spam.Spam; diff --git a/java/com/android/incallui/spam/SpamNotificationActivity.java b/java/com/android/incallui/spam/SpamNotificationActivity.java index 88d6bdfda..98cc2f3da 100644 --- a/java/com/android/incallui/spam/SpamNotificationActivity.java +++ b/java/com/android/incallui/spam/SpamNotificationActivity.java @@ -34,9 +34,10 @@ import com.android.dialer.blocking.BlockedNumbersMigrator; import com.android.dialer.blocking.FilteredNumberAsyncQueryHandler; import com.android.dialer.blocking.FilteredNumberCompat; 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.R; import com.android.incallui.call.DialerCall; @@ -108,7 +109,8 @@ public class SpamNotificationActivity extends FragmentActivity { return PhoneNumberUtilsCompat.createTtsSpannable(number).toString(); } - private static void logCallImpression(Context context, Bundle bundle, int impression) { + private static void logCallImpression( + Context context, Bundle bundle, DialerImpression.Type impression) { Logger.get(context) .logCallImpression( impression, @@ -122,7 +124,8 @@ public class SpamNotificationActivity extends FragmentActivity { bundle.putBoolean(CALL_INFO_KEY_IS_SPAM, call.isSpam()); bundle.putString(CALL_INFO_KEY_CALL_ID, call.getUniqueCallId()); bundle.putLong(CALL_INFO_KEY_START_TIME_MILLIS, call.getTimeAddedMs()); - bundle.putInt(CALL_INFO_CONTACT_LOOKUP_RESULT_TYPE, call.getLogState().contactLookupResult); + bundle.putInt( + CALL_INFO_CONTACT_LOOKUP_RESULT_TYPE, call.getLogState().contactLookupResult.getNumber()); return bundle; } @@ -142,7 +145,9 @@ public class SpamNotificationActivity extends FragmentActivity { Intent intent = getIntent(); String number = getCallInfo().getString(CALL_INFO_KEY_PHONE_NUMBER); boolean isSpam = getCallInfo().getBoolean(CALL_INFO_KEY_IS_SPAM); - int contactLookupResultType = getCallInfo().getInt(CALL_INFO_CONTACT_LOOKUP_RESULT_TYPE, 0); + ContactLookupResult.Type contactLookupResultType = + ContactLookupResult.Type.forNumber( + getCallInfo().getInt(CALL_INFO_CONTACT_LOOKUP_RESULT_TYPE, 0)); switch (intent.getAction()) { case ACTION_ADD_TO_CONTACTS: logCallImpression(DialerImpression.Type.SPAM_AFTER_CALL_NOTIFICATION_ADD_TO_CONTACTS); @@ -164,6 +169,7 @@ public class SpamNotificationActivity extends FragmentActivity { showNonSpamDialog(); } break; + default: // fall out } } @@ -179,7 +185,8 @@ public class SpamNotificationActivity extends FragmentActivity { } /** Creates and displays the dialog for whitelisting a number. */ - private void maybeShowNotSpamDialog(final String number, final int contactLookupResultType) { + private void maybeShowNotSpamDialog( + final String number, final ContactLookupResult.Type contactLookupResultType) { if (Spam.get(this).isDialogEnabledForSpamNotification()) { BlockReportSpamDialogs.ReportNotSpamDialogFragment.newInstance( getFormattedNumber(number), @@ -198,7 +205,7 @@ public class SpamNotificationActivity extends FragmentActivity { /** Creates and displays the dialog for blocking/reporting a number as spam. */ private void maybeShowBlockReportSpamDialog( - final String number, final int contactLookupResultType) { + final String number, final ContactLookupResult.Type contactLookupResultType) { if (Spam.get(this).isDialogEnabledForSpamNotification()) { maybeShowBlockNumberMigrationDialog( new BlockedNumbersMigrator.Listener() { @@ -252,7 +259,7 @@ public class SpamNotificationActivity extends FragmentActivity { /** Block and report the number as spam. */ private void blockReportNumberAndFinish( - String number, boolean reportAsSpam, int contactLookupResultType) { + String number, boolean reportAsSpam, ContactLookupResult.Type contactLookupResultType) { if (reportAsSpam) { logCallImpression(DialerImpression.Type.SPAM_AFTER_CALL_NOTIFICATION_MARKED_NUMBER_AS_SPAM); Spam.get(this) @@ -271,7 +278,8 @@ public class SpamNotificationActivity extends FragmentActivity { } /** Report the number as not spam. */ - private void reportNotSpamAndFinish(String number, int contactLookupResultType) { + private void reportNotSpamAndFinish( + String number, ContactLookupResult.Type contactLookupResultType) { logCallImpression(DialerImpression.Type.SPAM_AFTER_CALL_NOTIFICATION_REPORT_NUMBER_AS_NOT_SPAM); Spam.get(this) .reportNotSpamFromAfterCallNotification( @@ -307,7 +315,7 @@ public class SpamNotificationActivity extends FragmentActivity { return getIntent().getBundleExtra(EXTRA_CALL_INFO); } - private void logCallImpression(int impression) { + private void logCallImpression(DialerImpression.Type impression) { logCallImpression(this, getCallInfo(), impression); } @@ -356,8 +364,9 @@ public class SpamNotificationActivity extends FragmentActivity { final SpamNotificationActivity spamNotificationActivity = (SpamNotificationActivity) getActivity(); final String number = getArguments().getString(CALL_INFO_KEY_PHONE_NUMBER); - final int contactLookupResultType = - getArguments().getInt(CALL_INFO_CONTACT_LOOKUP_RESULT_TYPE, 0); + final ContactLookupResult.Type contactLookupResultType = + ContactLookupResult.Type.forNumber( + getArguments().getInt(CALL_INFO_CONTACT_LOOKUP_RESULT_TYPE, 0)); return new AlertDialog.Builder(getActivity()) .setCancelable(false) @@ -442,8 +451,9 @@ public class SpamNotificationActivity extends FragmentActivity { final SpamNotificationActivity spamNotificationActivity = (SpamNotificationActivity) getActivity(); final String number = getArguments().getString(CALL_INFO_KEY_PHONE_NUMBER); - final int contactLookupResultType = - getArguments().getInt(CALL_INFO_CONTACT_LOOKUP_RESULT_TYPE, 0); + final ContactLookupResult.Type contactLookupResultType = + ContactLookupResult.Type.forNumber( + getArguments().getInt(CALL_INFO_CONTACT_LOOKUP_RESULT_TYPE, 0)); return new AlertDialog.Builder(getActivity()) .setTitle(getString(R.string.non_spam_notification_title, getFormattedNumber(number))) .setCancelable(false) 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