summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTony Wickham <twickham@google.com>2017-04-10 23:31:42 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-04-10 23:31:42 +0000
commit7fc94d7aacddb12e6d50401314fdc029d20939a6 (patch)
tree8ede34755a110eafd2b5c7f01f4b2c27b14c8b42 /src
parent70197166206a3b075eb4e901ce2aab78d887bb34 (diff)
parentcd4cc97f6f761b8cc377821a2214432a376dd4f8 (diff)
downloadandroid_packages_apps_Trebuchet-7fc94d7aacddb12e6d50401314fdc029d20939a6.tar.gz
android_packages_apps_Trebuchet-7fc94d7aacddb12e6d50401314fdc029d20939a6.tar.bz2
android_packages_apps_Trebuchet-7fc94d7aacddb12e6d50401314fdc029d20939a6.zip
Merge "Disable notification listener on pre-26" into ub-launcher3-dorval
am: cd4cc97f6f Change-Id: I6e1a2de2ece9308f057e6cdea1a3a50b2dd32962
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/notification/NotificationListener.java9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/com/android/launcher3/notification/NotificationListener.java b/src/com/android/launcher3/notification/NotificationListener.java
index 75a1b8ab5..cb37f0852 100644
--- a/src/com/android/launcher3/notification/NotificationListener.java
+++ b/src/com/android/launcher3/notification/NotificationListener.java
@@ -28,7 +28,6 @@ import android.support.v4.util.Pair;
import android.text.TextUtils;
import com.android.launcher3.LauncherModel;
-import com.android.launcher3.Utilities;
import com.android.launcher3.config.FeatureFlags;
import com.android.launcher3.util.PackageUserKey;
@@ -219,11 +218,9 @@ public class NotificationListener extends NotificationListenerService {
}
private boolean shouldBeFilteredOut(StatusBarNotification sbn) {
- if (Utilities.isAtLeastO()) {
- getCurrentRanking().getRanking(sbn.getKey(), mTempRanking);
- if (!mTempRanking.canShowBadge()) {
- return true;
- }
+ getCurrentRanking().getRanking(sbn.getKey(), mTempRanking);
+ if (!mTempRanking.canShowBadge()) {
+ return true;
}
Notification notification = sbn.getNotification();
if (mTempRanking.getChannel().getId().equals(NotificationChannel.DEFAULT_CHANNEL_ID)) {