commit 0d0c052fb493b0bf7e199cfca3e20eb5e9097a77
author Linux Build Service Account <lnxbuild@localhost> Thu Sep 05 22:11:19 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Sep 05 22:11:19 2013 -0700
tree 0bf3be4310f9f941e05a61d77575032f5522e4e4
parent d0a70bc6a4b543c2bc4f7e3f0d27655a46d11f17
parent e5e229e89e99f2a9062f03a8a5eadd42e27cd7ba

Merge "FTP: Remove FTP Nofification on BT TURN OFF."

src/org/codeaurora/bluetooth/ftp/BluetoothFtpService.java

diff --git a/src/org/codeaurora/bluetooth/ftp/BluetoothFtpService.java b/src/org/codeaurora/bluetooth/ftp/BluetoothFtpService.java
index 2f9c2c9..ceec144 100644
--- a/src/org/codeaurora/bluetooth/ftp/BluetoothFtpService.java
+++ b/src/org/codeaurora/bluetooth/ftp/BluetoothFtpService.java
@@ -299,12 +299,10 @@
                 if (mSessionStatusHandler.hasMessages(MSG_INTERNAL_USER_TIMEOUT)) {
                     Intent i = new Intent(USER_CONFIRM_TIMEOUT_ACTION);
                     sendBroadcast(i);
-                    removeFtpNotification(NOTIFICATION_ID_AUTH);
+                    removeFtpNotification(NOTIFICATION_ID_ACCESS);
                 }
                 // Release all resources
                 closeService();
-            } else {
-                removeTimeoutMsg = false;
             }
         } else if (action.equals(ACCESS_ALLOWED_ACTION)) {
             if (!isWaitingAuthorization) {