commit 39091bd5f7c795fb5e85b2f815a1c60862ee1955
author qctecmdr <qctecmdr@localhost> Wed Mar 30 22:16:25 2022 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Mar 30 22:16:25 2022 -0700
tree 0b7e6cc027c07603edc7f933f4152be6f69da0cc
parent 6d4c11d5fa0718f5901d1f141e9826c069b8afb0
parent a44740c3bfccb30ef6b7275828adefbb5b754cc3

Merge "agm: export agm_service_wrapper head file"

ipc/HwBinders/agm_ipc_client/src/agm_client_wrapper.cpp

diff --git a/ipc/HwBinders/agm_ipc_client/src/agm_client_wrapper.cpp b/ipc/HwBinders/agm_ipc_client/src/agm_client_wrapper.cpp
index f7b7df1..eececa5 100644
--- a/ipc/HwBinders/agm_ipc_client/src/agm_client_wrapper.cpp
+++ b/ipc/HwBinders/agm_ipc_client/src/agm_client_wrapper.cpp
@@ -88,7 +88,7 @@
 static pthread_mutex_t agmclient_init_lock = PTHREAD_MUTEX_INITIALIZER;
 static android::sp<IAGM> agm_client = NULL;
 static sp<server_death_notifier> Server_death_notifier = NULL;
-static bool is_cb_registered = false;
+sp<IAGMCallback> ClbkBinder = NULL;
 static list_declare(client_clbk_data_list);
 static pthread_mutex_t clbk_data_list_lock = PTHREAD_MUTEX_INITIALIZER;
 
@@ -689,18 +689,15 @@
            session_id, evt_type, client_data);
     int32_t ret = 0;
     if (!agm_server_died) {
-        sp<IAGMCallback> ClbkBinder = NULL;
         ClntClbk *cl_clbk_data = NULL;
         uint64_t cl_clbk_data_add = 0;
         android::sp<IAGM> agm_client = get_agm_server();
-        if (!is_cb_registered) {
+        if (!ClbkBinder)
             ClbkBinder = new AGMCallback();
-            ret = agm_client->ipc_agm_client_register_callback(ClbkBinder);
-            if (ret) {
-                ALOGE("Client callback registration failed");
-                return ret;
-            }
-            is_cb_registered = true;
+        ret = agm_client->ipc_agm_client_register_callback(ClbkBinder);
+        if (ret) {
+            ALOGE("Client callback registration failed");
+            return ret;
         }
         if (cb != NULL) {
             cl_clbk_data = new ClntClbk(session_id, cb, evt_type, client_data);

ipc/HwBinders/agm_ipc_service/src/agm_server_wrapper.cpp

diff --git a/ipc/HwBinders/agm_ipc_service/src/agm_server_wrapper.cpp b/ipc/HwBinders/agm_ipc_service/src/agm_server_wrapper.cpp
index 7de89aa..7ae89d2 100644
--- a/ipc/HwBinders/agm_ipc_service/src/agm_server_wrapper.cpp
+++ b/ipc/HwBinders/agm_ipc_service/src/agm_server_wrapper.cpp
@@ -112,7 +112,7 @@
         // Debug message to print original sender's info in the tombstone
         ALOGE_IF(d_info->signal == DEBUGGER_SIGNAL,
                  "signal %d (<debuggerd signal>), code -1 "
-                 "(SI_QUEUE from originating pid %d, uid %d)",
+                 "(SI_QUEUE from pid %d, uid %d)",
                  d_info->signal, d_info->pid, d_info->uid);
         if (sigqueue(getpid(), DEBUGGER_SIGNAL, {.sival_int = 0}) < 0) {
             ALOGW("%s: Sending signal %d failed with error %d",