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

Commit b8796212 authored by Brad Fitzpatrick's avatar Brad Fitzpatrick
Browse files

resolved conflicts for merge of ceae9983 to honeycomb-plus-aosp 

Change-Id: Ic677e58dcc182908ae1fde33047b3fda013a37c3
parents d927e274 ceae9983

core/java/android/app/Notification.java

+1 −1
Original line number Diff line number Diff line
@@ -416,7 +416,7 @@ public class Notification implements Parcelable 
        if (this.largeIcon != null) {

            that.largeIcon = Bitmap.createBitmap(this.largeIcon);

        }

        that.iconLevel = that.iconLevel;

        that.iconLevel = this.iconLevel;

        that.sound = this.sound; // android.net.Uri is immutable

        that.audioStreamType = this.audioStreamType;