am 0d1bd191: am 7fd1386b: Merge "Properly cancel Tether notification." into jb-mr1-dev

* commit '0d1bd1911e3fe470a4da5fd82ba602c6c3cc8944': Properly cancel Tether notification.
2012-10-04 16:56:06 -07:00
parent 50d849ed89 0d1bd1911e
commit ca6a2c3453
1 changed files with 2 additions and 1 deletions
--- a/services/java/com/android/server/connectivity/Tethering.java
+++ b/services/java/com/android/server/connectivity/Tethering.java
@@ -454,7 +454,8 @@ public class Tethering extends INetworkManagementEventObserver.Stub {
            if (mTetheredNotification.icon == icon) {
                return;
            }
-            notificationManager.cancel(mTetheredNotification.icon);
+            notificationManager.cancelAsUser(null, mTetheredNotification.icon,
+                    UserHandle.ALL);
        }

        Intent intent = new Intent();