Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: Ic677e58dcc182908ae1fde33047b3fda013a37c3
This commit is contained in:
Brad Fitzpatrick
2011-03-15 11:54:46 -07:00
parent d927e27428 ceae99835e
commit b8796212e3
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/app/Notification.java
View File

@@ -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;