am e96e0a1a: Merge "Resolve USER_ALL when inflating notification views." into jb-mr1-dev

* commit 'e96e0a1a759a524072cc3fb1dfd3ec01e18ef67f': Resolve USER_ALL when inflating notification views.
2012-11-02 15:30:19 -07:00
parent cc22036494 e96e0a1a75
commit 617404a4f6
1 changed files with 3 additions and 0 deletions
--- 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);
        }