summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorRobert Greenwalt <rgreenwalt@google.com>2012-10-04 16:50:39 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-10-04 16:50:40 -0700
commit7fd1386b8a2b30669e0ffe0bacf17dd1feb5dba5 (patch)
treeaea13f15ab63075f658664136ad2007e0971374a /services
parenta9afaccf303da2b57a47ad16cca559e87e649d15 (diff)
parent3cab6b0f1deff1ee4b4b2e048935f2201d2cbc0d (diff)
downloadframeworks_base-7fd1386b8a2b30669e0ffe0bacf17dd1feb5dba5.zip
frameworks_base-7fd1386b8a2b30669e0ffe0bacf17dd1feb5dba5.tar.gz
frameworks_base-7fd1386b8a2b30669e0ffe0bacf17dd1feb5dba5.tar.bz2
Merge "Properly cancel Tether notification." into jb-mr1-dev
Diffstat (limited to 'services')
-rw-r--r--services/java/com/android/server/connectivity/Tethering.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/services/java/com/android/server/connectivity/Tethering.java b/services/java/com/android/server/connectivity/Tethering.java
index b38d617..e4a7ead 100644
--- 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();