commit 8458fc313d1e9f072efc03a331dce151d476c596
author Ashwini Munigala <AshwiniM@codeaurora.org> Thu Jan 07 18:00:58 2016 +0530
committer Andre Eisenbach <eisenbach@google.com> Wed Mar 23 18:10:03 2016 +0000
tree 14306263c89b8642758d9ce91c960cb1c5c0e087
parent 7cbec75e7310370c6cb03cfcc48dc4ff1db951c8

MAP: Cleanup PendingIntent in cancelUserTimeoutAlarm.

Handle cleanup for timeout Intent and pending Intent
in cancelUserTimeoutAlarm API.

Change-Id: I4f4184785675b2deffa3be8c9dd70b2673020b51

src/com/android/bluetooth/map/BluetoothMapService.java

diff --git a/src/com/android/bluetooth/map/BluetoothMapService.java b/src/com/android/bluetooth/map/BluetoothMapService.java
index 3e9cdcd..3faeb34 100644
--- a/src/com/android/bluetooth/map/BluetoothMapService.java
+++ b/src/com/android/bluetooth/map/BluetoothMapService.java
@@ -859,10 +859,12 @@
 
     private void cancelUserTimeoutAlarm(){
         if (DEBUG) Log.d(TAG,"cancelUserTimeOutAlarm()");
-        Intent intent = new Intent(this, BluetoothMapService.class);
-        PendingIntent sender = PendingIntent.getBroadcast(this, 0, intent, 0);
+        Intent timeoutIntent = new Intent(USER_CONFIRM_TIMEOUT_ACTION);
+        PendingIntent pIntent = PendingIntent.getBroadcast(this, 0, timeoutIntent, 0);
+        pIntent.cancel();
+
         AlarmManager alarmManager = (AlarmManager) this.getSystemService(Context.ALARM_SERVICE);
-        alarmManager.cancel(sender);
+        alarmManager.cancel(pIntent);
         mRemoveTimeoutMsg = false;
     }