From ade544b799c3206029dd27cc531eb160fb9f2b19 Mon Sep 17 00:00:00 2001
From: Hansong Zhang <hsz@google.com>
Date: Fri, 22 Jan 2021 17:30:40 -0800
Subject: [PATCH] BTM_PM_REG_SET should imply BTM_PM_REG_NOTIF

From its only use case

Test: cert/run
Tag: #gd-refactor
Bug: 141555841
Change-Id: Ic464f1989b49b8b1be115aba8b62bca8d78c5cc0
---
 bta/dm/bta_dm_pm.cc           |  3 +--
 stack/acl/btm_pm.cc           | 14 ++++++--------
 stack/include/btm_api_types.h |  2 --
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/bta/dm/bta_dm_pm.cc b/bta/dm/bta_dm_pm.cc
index ea6499415..f9fb7aa8d 100644
--- a/bta/dm/bta_dm_pm.cc
+++ b/bta/dm/bta_dm_pm.cc
@@ -87,8 +87,7 @@ void bta_dm_init_pm(void) {
   if (p_bta_dm_pm_cfg[0].app_id != 0) {
     bta_sys_pm_register(bta_dm_pm_cback);
 
-    BTM_PmRegister((BTM_PM_REG_SET | BTM_PM_REG_NOTIF), &bta_dm_cb.pm_id,
-                   bta_dm_pm_btm_cback);
+    BTM_PmRegister((BTM_PM_REG_SET), &bta_dm_cb.pm_id, bta_dm_pm_btm_cback);
   }
 
   /* Need to initialize all PM timer service IDs */
diff --git a/stack/acl/btm_pm.cc b/stack/acl/btm_pm.cc
index 03165583d..4eff816f1 100644
--- a/stack/acl/btm_pm.cc
+++ b/stack/acl/btm_pm.cc
@@ -147,10 +147,8 @@ tBTM_STATUS BTM_PmRegister(uint8_t mask, uint8_t* p_pm_id,
     /* find an unused entry */
     if (pm_reg_db[xx].mask == BTM_PM_REC_NOT_USED) {
       /* if register for notification, should provide callback routine */
-      if (mask & BTM_PM_REG_NOTIF) {
-        if (p_cb == NULL) return BTM_ILLEGAL_VALUE;
-        pm_reg_db[xx].cback = p_cb;
-      }
+      if (p_cb == NULL) return BTM_ILLEGAL_VALUE;
+      pm_reg_db[xx].cback = p_cb;
       pm_reg_db[xx].mask = mask;
       *p_pm_id = xx;
       return BTM_SUCCESS;
@@ -377,7 +375,7 @@ void btm_pm_reset(void) {
 
   /* clear the pending request for application */
   if ((pm_pend_id != BTM_PM_SET_ONLY_ID) &&
-      (pm_reg_db[pm_pend_id].mask & BTM_PM_REG_NOTIF)) {
+      (pm_reg_db[pm_pend_id].mask & BTM_PM_REG_SET)) {
     cb = pm_reg_db[pm_pend_id].cback;
   }
 
@@ -665,7 +663,7 @@ void btm_pm_proc_cmd_status(tHCI_STATUS status) {
 
   /* notify the caller is appropriate */
   if ((pm_pend_id != BTM_PM_SET_ONLY_ID) &&
-      (pm_reg_db[pm_pend_id].mask & BTM_PM_REG_NOTIF)) {
+      (pm_reg_db[pm_pend_id].mask & BTM_PM_REG_SET)) {
     const RawAddress bd_addr = pm_mode_db[pm_pend_link].bda_;
     LOG_DEBUG("Notifying callback that link power mode is complete peer:%s",
               PRIVATE_ADDRESS(bd_addr));
@@ -752,7 +750,7 @@ void btm_pm_proc_mode_change(tHCI_STATUS hci_status, uint16_t hci_handle,
 
   /* notify registered parties */
   for (int yy = 0; yy < BTM_MAX_PM_RECORDS; yy++) {
-    if (pm_reg_db[yy].mask & BTM_PM_REG_NOTIF) {
+    if (pm_reg_db[yy].mask & BTM_PM_REG_SET) {
       (*pm_reg_db[yy].cback)(p_cb->bda_, mode, interval, hci_status);
     }
   }
@@ -792,7 +790,7 @@ void process_ssr_event(tHCI_STATUS status, uint16_t handle,
 
   int cnt = 0;
   for (int yy = 0; yy < BTM_MAX_PM_RECORDS; yy++) {
-    if (pm_reg_db[yy].mask & BTM_PM_REG_NOTIF) {
+    if (pm_reg_db[yy].mask & BTM_PM_REG_SET) {
       (*pm_reg_db[yy].cback)(bd_addr, BTM_PM_STS_SSR, (use_ssr) ? 1 : 0,
                              status);
       cnt++;
diff --git a/stack/include/btm_api_types.h b/stack/include/btm_api_types.h
index 54ebb1996..a9ae91c45 100644
--- a/stack/include/btm_api_types.h
+++ b/stack/include/btm_api_types.h
@@ -965,8 +965,6 @@ inline std::string power_mode_text(tBTM_PM_MODE mode) {
 typedef enum : uint8_t {
   /* The module wants to set the desired power mode */
   BTM_PM_REG_SET = (1u << 0),
-  /* The module wants to receive mode change event */
-  BTM_PM_REG_NOTIF = (1u << 1),
   /* The module does not want to involve with PM anymore */
   BTM_PM_DEREG = (1u << 2),
 } tBTM_PM_REGISTER;
-- 
2.11.0