From: Pavlin Radoslavov <pavlin@google.com>
Date: Thu, 28 Jan 2016 00:03:19 +0000 (-0800)
Subject: Allow alarm_cancel() on NULL timers
X-Git-Tag: android-x86-7.1-r1~394^2~10
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=dd7aaec9e8;p=android-x86%2Fsystem-bt.git

Allow alarm_cancel() on NULL timers

Remove an assert that prevents using alarm_cancel() with NULL
timers.

Bug: 26831803
Change-Id: Ifd1476272b13a3f7fd5a0dbb57ee867cbfe2c2bb
---

diff --git a/osi/src/alarm.c b/osi/src/alarm.c
index a00aacc6c..2ccdd4fe2 100644
--- a/osi/src/alarm.c
+++ b/osi/src/alarm.c
@@ -260,7 +260,8 @@ static void alarm_set_internal(alarm_t *alarm, period_ms_t period,
 
 void alarm_cancel(alarm_t *alarm) {
   assert(alarms != NULL);
-  assert(alarm != NULL);
+  if (!alarm)
+    return;
 
   pthread_mutex_lock(&monitor);