commit 18285cecc9e8d69a242725fbd4a45b16c0d3d76e
author Chris Manton <cmanton@google.com> Mon Jan 06 15:17:17 2020 -0800
committer Chris Manton <cmanton@google.com> Mon Jan 06 15:31:09 2020 -0800
tree c2fc3a7e57062a33ae2b5b524c46e558939370de
parent 5c986c39041d586ec3016d18e80d2c52a758f2e1

Add runtime sanity checks

Bug: 146086425
Test: Manually boots
Change-Id: I17e10a2c7fa9646b2a727da726ed3757d42439e3

system/gd/shim/stack.cc

diff --git a/system/gd/shim/stack.cc b/system/gd/shim/stack.cc
index 757fd90..2c07123 100644
--- a/system/gd/shim/stack.cc
+++ b/system/gd/shim/stack.cc
@@ -103,46 +103,57 @@
   }
 
   IAdvertising* GetAdvertising() {
+    ASSERT(is_running_);
     return stack_manager_.GetInstance<bluetooth::shim::Advertising>();
   }
 
   IController* GetController() {
+    ASSERT(is_running_);
     return stack_manager_.GetInstance<bluetooth::shim::Controller>();
   }
 
   IConnectability* GetConnectability() {
+    ASSERT(is_running_);
     return stack_manager_.GetInstance<bluetooth::shim::Connectability>();
   }
 
   IDiscoverability* GetDiscoverability() {
+    ASSERT(is_running_);
     return stack_manager_.GetInstance<bluetooth::shim::Discoverability>();
   }
 
   IHciLayer* GetHciLayer() {
+    ASSERT(is_running_);
     return stack_manager_.GetInstance<bluetooth::shim::HciLayer>();
   }
 
   IInquiry* GetInquiry() {
+    ASSERT(is_running_);
     return stack_manager_.GetInstance<bluetooth::shim::Inquiry>();
   }
 
   IL2cap* GetL2cap() {
+    ASSERT(is_running_);
     return stack_manager_.GetInstance<bluetooth::shim::L2cap>();
   }
 
   IName* GetName() {
+    ASSERT(is_running_);
     return stack_manager_.GetInstance<bluetooth::shim::Name>();
   }
 
   IPage* GetPage() {
+    ASSERT(is_running_);
     return stack_manager_.GetInstance<bluetooth::shim::Page>();
   }
 
   IScanning* GetScanning() {
+    ASSERT(is_running_);
     return stack_manager_.GetInstance<bluetooth::shim::Scanning>();
   }
 
   ISecurity* GetSecurity() {
+    ASSERT(is_running_);
     return stack_manager_.GetInstance<bluetooth::shim::Security>();
   }
 

system/main/shim/l2c_api.cc

diff --git a/system/main/shim/l2c_api.cc b/system/main/shim/l2c_api.cc
index 1446816..7224aab 100644
--- a/system/main/shim/l2c_api.cc
+++ b/system/main/shim/l2c_api.cc
@@ -30,6 +30,8 @@
                                         tL2CAP_APPL_INFO* callbacks,
                                         bool enable_snoop,
                                         tL2CAP_ERTM_INFO* p_ertm_info) {
+  CHECK(callbacks != nullptr);
+
   if (L2C_INVALID_PSM(client_psm)) {
     LOG_ERROR(LOG_TAG, "%s Invalid classic psm:%hd", __func__, client_psm);
     return 0;