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

Commit 6738eeec authored by Daniel Sandler's avatar Daniel Sandler
Browse files

Cleanups in Notification.java. 

Bug: 7555827 // remove named TODO, fix toString output
Bug: 6440961 // remove longstanding and mysterious "MUMBLE MUMBLE"
Change-Id: I8b5e16fb1f7ccbe5cbda37f260fdc6bc0e1b8ee3
parent e3ac5321

core/java/android/app/Notification.java

+8 −8
Original line number Diff line number Diff line
@@ -388,8 +388,8 @@ public class Notification implements Parcelable 
     * Priority is an indication of how much of the user's valuable attention should be consumed by

     * this notification. Low-priority notifications may be hidden from the user in certain

     * situations, while the user might be interrupted for a higher-priority notification. The

     * system will make a determination about how to interpret notification priority as described in

     * MUMBLE MUMBLE.

     * system will make a determination about how to interpret this priority when presenting

     * the notification.

     */

    public int priority;
@@ -846,7 +846,9 @@ public class Notification implements Parcelable 
        }

        // TODO(dsandler): defaults take precedence over local values, so reorder the branches below

        sb.append(" vibrate=");

        if (this.vibrate != null) {

        if ((this.defaults & DEFAULT_VIBRATE) != 0) {

            sb.append("default");

        } else if (this.vibrate != null) {

            int N = this.vibrate.length-1;

            sb.append("[");

            for (int i=0; i<N; i++) {
@@ -857,16 +859,14 @@ public class Notification implements Parcelable 
                sb.append(this.vibrate[N]);

            }

            sb.append("]");

        } else if ((this.defaults & DEFAULT_VIBRATE) != 0) {

            sb.append("default");

        } else {

            sb.append("null");

        }

        sb.append(" sound=");

        if (this.sound != null) {

            sb.append(this.sound.toString());

        } else if ((this.defaults & DEFAULT_SOUND) != 0) {

        if ((this.defaults & DEFAULT_SOUND) != 0) {

            sb.append("default");

        } else if (this.sound != null) {

            sb.append(this.sound.toString());

        } else {

            sb.append("null");

        }