commit ad17d11c7495b1fdb5ca6faba74a741b17cf19f9
author Robert Greenwalt <robdroid@android.com> Fri Mar 19 09:02:00 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 19 09:02:00 2010 -0700
tree eb8e89e4732e4c2ffa32b24298382689dfd4ae67
parent d12b232575faa44163157c2d4aa988e7a5974a3e
parent db3fe9edd4cb638d3dd20b23456f6cdb0a414ed1

Merge "Fix Tethering Notifications for multiple ifaces"

services/java/com/android/server/connectivity/Tethering.java

diff --git a/services/java/com/android/server/connectivity/Tethering.java b/services/java/com/android/server/connectivity/Tethering.java
index fcb39c9..d57457eb 100644
--- a/services/java/com/android/server/connectivity/Tethering.java
+++ b/services/java/com/android/server/connectivity/Tethering.java
@@ -365,6 +365,13 @@
             return;
         }
 
+        if (mTetheredNotification != null) {
+            if (mTetheredNotification.icon == icon) {
+                return;
+            }
+            notificationManager.cancel(mTetheredNotification.icon);
+        }
+
         Intent intent = new Intent();
         intent.setClassName("com.android.settings", "com.android.settings.TetherSettings");
         intent.setFlags(Intent.FLAG_ACTIVITY_NO_HISTORY);