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

Commit de4b2645 authored by Chris Wren's avatar Chris Wren
Browse files

unbreak the build, 

plus some followon patches from Id3b0a074

Change-Id: I9f667a8d68a68d90c0d7f2fed3f28efcc6720533
parent 41c264ba

packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java

+1 −1
Original line number Diff line number Diff line
@@ -2271,7 +2271,7 @@ public abstract class BaseStatusBar extends SystemUI implements 




        if (mNotificationData.shouldSuppressPeek(sbn.getKey())) {

            if (DEBUG) Log.d(TAG, "No peeking: suppressed by manager: " + sbn.getKey());

            if (DEBUG) Log.d(TAG, "No peeking: suppressed by DND: " + sbn.getKey());

            return false;

        }

services/core/java/com/android/server/notification/NotificationRecord.java

+2 −5
Original line number Diff line number Diff line
@@ -218,7 +218,6 @@ public final class NotificationRecord { 
                        action.actionIntent.toString()

                        ));

            }

            }

            pw.println(prefix + "  }");

        }

        if (notification.extras != null && notification.extras.size() > 0) {
@@ -342,11 +341,9 @@ public final class NotificationRecord { 
    }



    public void setTopicImportance(int importance) {

        if (importance != NotificationListenerService.Ranking.IMPORTANCE_UNSPECIFIED) {

        mTopicImportance = importance;

        applyTopicImportance();

    }

    }



    private String getTopicExplanation() {

        if (mTopicExplanation == null) {