diff options
| author | Brandon Maxwell <maxwelb@google.com> | 2016-03-22 16:57:15 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-03-22 16:57:15 +0000 |
| commit | 6dd61510f2c019a8c662257e368568bb93e9d9e0 (patch) | |
| tree | 46a3ca5948e97838e2b3f1351a1da1c16d02b34c /src/com/android/dialer | |
| parent | 9877f59d3c4af34bedbbd27e45d00efa0ccb0b6a (diff) | |
| parent | cf230a91080dcfddb82fe4a42c401d77e6ae9bca (diff) | |
Merge "No notification shown for blocking after E911 call" into nyc-dev
am: cf230a9
* commit 'cf230a91080dcfddb82fe4a42c401d77e6ae9bca':
No notification shown for blocking after E911 call
Diffstat (limited to 'src/com/android/dialer')
| -rw-r--r-- | src/com/android/dialer/filterednumber/FilteredNumbersUtil.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/dialer/filterednumber/FilteredNumbersUtil.java b/src/com/android/dialer/filterednumber/FilteredNumbersUtil.java index e3870ded9..498b10a45 100644 --- a/src/com/android/dialer/filterednumber/FilteredNumbersUtil.java +++ b/src/com/android/dialer/filterednumber/FilteredNumbersUtil.java @@ -33,6 +33,7 @@ import android.widget.Toast; import com.android.contacts.common.testing.NeededForTesting; import com.android.dialer.R; +import com.android.dialer.compat.FilteredNumberCompat; import com.android.dialer.database.FilteredNumberAsyncQueryHandler; import com.android.dialer.database.FilteredNumberAsyncQueryHandler.OnHasBlockedNumbersListener; import com.android.dialer.database.FilteredNumberContract.FilteredNumber; @@ -298,6 +299,10 @@ public class FilteredNumbersUtil { } public static void maybeNotifyCallBlockingDisabled(final Context context) { + // The Dialer is not responsible for this notification after migrating + if (FilteredNumberCompat.useNewFiltering()) { + return; + } // Skip if the user has already received a notification for the most recent emergency call. if (PreferenceManager.getDefaultSharedPreferences(context) .getBoolean(NOTIFIED_CALL_BLOCKING_DISABLED_BY_EMERGENCY_CALL_PREF_KEY, false)) { |