Merge "Properly cancel Tether notification." into jb-mr1-dev

Robert Greenwalt · Android (Google) Code Review · commit 7fd1386b8a2b · 2012-10-04T16:50:40.000-07:00
diff --git a/services/java/com/android/server/connectivity/Tethering.java b/services/java/com/android/server/connectivity/Tethering.java
@@ -454,7 +454,8 @@ private void showTetheredNotification(int icon) {
             if (mTetheredNotification.icon == icon) {
                 return;
             }
-            notificationManager.cancel(mTetheredNotification.icon);
+            notificationManager.cancelAsUser(null, mTetheredNotification.icon,
+                    UserHandle.ALL);
         }
 
         Intent intent = new Intent();

Original file line number	Diff line number	Diff line change
`@@ -454,7 +454,8 @@ private void showTetheredNotification(int icon) {`
`454`	`454`	`if (mTetheredNotification.icon == icon) {`
`455`	`455`	`return;`
`456`	`456`	`}`
`457`		`- notificationManager.cancel(mTetheredNotification.icon);`
	`457`	`+ notificationManager.cancelAsUser(null, mTetheredNotification.icon,`
	`458`	`+ UserHandle.ALL);`
`458`	`459`	`}`
`459`	`460`
`460`	`461`	`Intent intent = new Intent();`