From: Michael Sun <michaelfsun@google.com>
Date: Mon, 16 Nov 2020 21:53:12 +0000 (+0000)
Subject: btaa: null check btaa instance when receiving callback from SystemSuspend
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0bdcd4ad41651c90afe399132995c6568d4691e4;p=android-x86%2Fsystem-bt.git

btaa: null check btaa instance when receiving callback from SystemSuspend

Perform null pointer check upon receive callbacks from SystemSuspend
to mitigation the exception caused crash.

Tag: #feature
Bug: 173435736
Test: m
Change-Id: Ie15d179ebce82fdd91f32b3d8a98bb9bf8c66e84
---

diff --git a/btaa/src/activity_attribution.cc b/btaa/src/activity_attribution.cc
index 3ccc882e5..213b27796 100644
--- a/btaa/src/activity_attribution.cc
+++ b/btaa/src/activity_attribution.cc
@@ -69,18 +69,24 @@ void ActivityAttributionImpl::onWakeup(
     bool success, const std::vector<std::string>& wakeupReasons) {}
 
 Status WakelockCallback::notifyAcquired(void) {
-  instance->onWakelockAcquired();
+  if (instance) {
+    instance->onWakelockAcquired();
+  }
   return Status::ok();
 }
 
 Status WakelockCallback::notifyReleased(void) {
-  instance->onWakelockReleased();
+  if (instance) {
+    instance->onWakelockReleased();
+  }
   return Status::ok();
 }
 
 Status WakeupCallback::notifyWakeup(
     bool success, const std::vector<std::string>& wakeupReasons) {
-  instance->onWakeup(success, wakeupReasons);
+  if (instance) {
+    instance->onWakeup(success, wakeupReasons);
+  }
   return Status::ok();
 }