summaryrefslogtreecommitdiffstats
path: root/core/java/android/app
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@android.com>2011-03-15 11:33:40 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-03-15 11:33:40 -0700
commitceae99835ed909346f23cc604d20a488ac63c6ce (patch)
tree4dcdbcfb2dc7dc00342f1f337c7389b4337703e0 /core/java/android/app
parentb7d573e901e07fc249df0bc531cf94c574107556 (diff)
parent9a01a2f2720632aa9cc230a4ebb0ed7aee762eec (diff)
downloadframeworks_base-ceae99835ed909346f23cc604d20a488ac63c6ce.zip
frameworks_base-ceae99835ed909346f23cc604d20a488ac63c6ce.tar.gz
frameworks_base-ceae99835ed909346f23cc604d20a488ac63c6ce.tar.bz2
am 9a01a2f2: Merge "Fixing self-assignment in cloning code."
* commit '9a01a2f2720632aa9cc230a4ebb0ed7aee762eec': Fixing self-assignment in cloning code.
Diffstat (limited to 'core/java/android/app')
-rw-r--r--core/java/android/app/Notification.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
index 856943d..414a2a1 100644
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -374,7 +374,7 @@ public class Notification implements Parcelable
if (this.contentView != null) {
that.contentView = this.contentView.clone();
}
- that.iconLevel = that.iconLevel;
+ that.iconLevel = this.iconLevel;
that.sound = this.sound; // android.net.Uri is immutable
that.audioStreamType = this.audioStreamType;