diff options
author | Amith Yamasani <yamasani@google.com> | 2012-11-02 15:26:28 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-11-02 15:26:37 -0700 |
commit | e96e0a1a759a524072cc3fb1dfd3ec01e18ef67f (patch) | |
tree | 9c662ec1f4c3bed36c529d531895d1ebc5f518a2 /core/java | |
parent | 685cc8c7cba0bef5257bf00e9821e82a2dbbfc91 (diff) | |
parent | ecbd68b0de73a16ce9d0cf2baa7153e1db14b34a (diff) | |
download | frameworks_base-e96e0a1a759a524072cc3fb1dfd3ec01e18ef67f.zip frameworks_base-e96e0a1a759a524072cc3fb1dfd3ec01e18ef67f.tar.gz frameworks_base-e96e0a1a759a524072cc3fb1dfd3ec01e18ef67f.tar.bz2 |
Merge "Resolve USER_ALL when inflating notification views." into jb-mr1-dev
Diffstat (limited to 'core/java')
-rw-r--r-- | core/java/android/app/Notification.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index 182ebef..ee92646 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -896,6 +896,9 @@ public class Notification implements Parcelable /** {@hide} */ public void setUser(UserHandle user) { + if (user.getIdentifier() == UserHandle.USER_ALL) { + user = UserHandle.OWNER; + } if (tickerView != null) { tickerView.setUser(user); } |