diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-04-10 23:57:15 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-04-10 23:57:15 +0000 |
commit | 75ab22bf01d4f5084c8f1ffd469a34c4250f4638 (patch) | |
tree | 167b66c15c9a454b1ba7ead6bbf40faadfd4b276 /java | |
parent | 2d5626caed7c93660a8fdd67a20684403f747099 (diff) | |
parent | 3b995bac4550982c62f805d7c334fbc7ed34b113 (diff) |
Merge "Add a flag to control whether to show spam blocking promotion"
Diffstat (limited to 'java')
-rw-r--r-- | java/com/android/dialer/spam/promo/SpamBlockingPromoHelper.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/java/com/android/dialer/spam/promo/SpamBlockingPromoHelper.java b/java/com/android/dialer/spam/promo/SpamBlockingPromoHelper.java index cba94e00d..56143ce7f 100644 --- a/java/com/android/dialer/spam/promo/SpamBlockingPromoHelper.java +++ b/java/com/android/dialer/spam/promo/SpamBlockingPromoHelper.java @@ -32,6 +32,7 @@ public class SpamBlockingPromoHelper { static final String SPAM_BLOCKING_PROMO_PERIOD_MILLIS = "spam_blocking_promo_period_millis"; static final String SPAM_BLOCKING_PROMO_LAST_SHOW_MILLIS = "spam_blocking_promo_last_show_millis"; + static final String ENABLE_SPAM_BLOCKING_PROMO = "enable_spam_blocking_promo"; private final Context context; private final SpamSettings spamSettings; @@ -64,14 +65,15 @@ public class SpamBlockingPromoHelper { * Returns true if we should show a spam blocking promo. * * <p>Should show spam blocking promo only when all of the following criteria meet 1. Spam - * blocking setting is available. 2. Spam blocking setting is not yet enabled. 3. Time since last - * spam blocking promo exceeds the threshold. + * blocking promo is enabled by flag. 2. Spam blocking setting is available. 3. Spam blocking + * setting is not yet enabled. 4. Time since last spam blocking promo exceeds the threshold. * * @return true if we should show a spam blocking promo. */ @VisibleForTesting boolean shouldShowSpamBlockingPromo() { - if (!spamSettings.isSpamEnabled() + if (!ConfigProviderBindings.get(context).getBoolean(ENABLE_SPAM_BLOCKING_PROMO, false) + || !spamSettings.isSpamEnabled() || !spamSettings.isSpamBlockingEnabledByFlag() || spamSettings.isSpamBlockingEnabledByUser()) { return false; |