Update OPP/PBAP UI

Add timeout handling to incoming file confirm dialog, to avoid uncertain
behavior when timeout happen
Fix PBAP request timeout issue when open/close slider, dismiss timeout
dialog to avoid uncertain behavior
Fix typo in strings

1 files changed, 13 insertions, 2 deletions

diff --git a/src/com/android/bluetooth/opp/BluetoothOppTransfer.java b/src/com/android/bluetooth/opp/BluetoothOppTransfer.java
index c84e69289..7ca7857db 100644
--- a/src/com/android/bluetooth/opp/BluetoothOppTransfer.java
+++ b/src/com/android/bluetooth/opp/BluetoothOppTransfer.java
@@ -34,6 +34,7 @@ package com.android.bluetooth.opp;
 
 import javax.obex.ObexTransport;
 
+import android.app.NotificationManager;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothSocket;
@@ -273,9 +274,19 @@ public class BluetoothOppTransfer implements BluetoothOppBatch.BluetoothOppBatch
                         }
                         if (V) Log.v(TAG, "mTransport closed ");
                     } else {
-                        /* For inbound transfer, the block point is waiting for user confirmation
-                         * we can interrupt it nicely
+                        /*
+                         * For inbound transfer, the block point is waiting for
+                         * user confirmation we can interrupt it nicely
                          */
+
+                        // Remove incoming file confirm notification
+                        NotificationManager nm = (NotificationManager)mContext
+                                .getSystemService(Context.NOTIFICATION_SERVICE);
+                        nm.cancel(mCurrentShare.mId);
+                        // Send intent to UI for timeout handling
+                        Intent in = new Intent(BluetoothShare.USER_CONFIRMATION_TIMEOUT_ACTION);
+                        mContext.sendBroadcast(in);
+
                         markShareTimeout(mCurrentShare);
                     }
                     break;