OPP: Handle intent receiver leak for BT TURN OFF.
Mark INBOUND and OUTBOUND active transfer as cancelled
on BT TURN OFF.
Change-Id: I52e6d59ba56e004af2dc25b85975dfeb6c19320a
diff --git a/src/com/android/bluetooth/opp/BluetoothOppService.java b/src/com/android/bluetooth/opp/BluetoothOppService.java
index 421ad2e..0491136 100755
--- a/src/com/android/bluetooth/opp/BluetoothOppService.java
+++ b/src/com/android/bluetooth/opp/BluetoothOppService.java
@@ -219,8 +219,20 @@
public void handleMessage(Message msg) {
switch (msg.what) {
case STOP_LISTENER:
- mSocketListener.stop();
+ if(mSocketListener != null){
+ mSocketListener.stop();
+ }
mListenStarted = false;
+ //Stop Active INBOUND Transfer
+ if(mServerTransfer != null){
+ mServerTransfer.onBatchCanceled();
+ mServerTransfer =null;
+ }
+ //Stop Active OUTBOUND Transfer
+ if(mTransfer != null){
+ mTransfer.onBatchCanceled();
+ mTransfer =null;
+ }
synchronized (BluetoothOppService.this) {
if (mUpdateThread == null) {
stopSelf();