Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5632e183 authored by Tony Wickham's avatar Tony Wickham
Browse files

Disable notification listener on pre-26 

Also remove isAtLeastO() checks in NotificationListener

Bug: 35443111
Bug: 37207407
Change-Id: If3eef406328f73d114d826e6c8a158bdc3788cac
parent 0aa685bb

res/values-v25/bools.xml

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/* Copyright 2017, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.

** You may obtain a copy of the License at

**

**     http://www.apache.org/licenses/LICENSE-2.0

**

** Unless required by applicable law or agreed to in writing, software

** distributed under the License is distributed on an "AS IS" BASIS,

** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

** See the License for the specific language governing permissions and

** limitations under the License.

*/

-->



<resources>

    <!-- TODO(b/35443111): remove from v25 and keep in v26 -->

    <bool name="notification_badging_enabled">true</bool>

</resources>
 
 No newline at end of file

src/com/android/launcher3/notification/NotificationListener.java

+3 −6
Original line number Diff line number Diff line
@@ -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,12 +218,10 @@ public class NotificationListener extends NotificationListenerService { 
    }



    private boolean shouldBeFilteredOut(StatusBarNotification sbn) {

        if (Utilities.isAtLeastO()) {

        getCurrentRanking().getRanking(sbn.getKey(), mTempRanking);

        if (!mTempRanking.canShowBadge()) {

            return true;

        }

        }

        Notification notification = sbn.getNotification();

        if (mTempRanking.getChannel().getId().equals(NotificationChannel.DEFAULT_CHANNEL_ID)) {

            // Special filtering for the default, legacy "Miscellaneous" channel.