From cc986a68b919f0ad8c624b5898d918a7930efffc Mon Sep 17 00:00:00 2001
From: Remi NGUYEN VAN <reminv@google.com>
Date: Fri, 28 Sep 2018 07:48:47 +0000
Subject: Revert "IPCThreadState: Add a public method to probe is a hwbinder
 called is being served."

This reverts commit b178762cf7a93842de56fa0d7a153e0694543821.

Reason for revert: This breaks framework tests and blocks presubmit

Change-Id: I9546c267d14390684f488542e92d7ac64c612488
---
 IPCThreadState.cpp | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'IPCThreadState.cpp')

diff --git a/IPCThreadState.cpp b/IPCThreadState.cpp
index d97ad12..b275a7e 100644
--- a/IPCThreadState.cpp
+++ b/IPCThreadState.cpp
@@ -17,7 +17,6 @@
 #define LOG_TAG "hw-IPCThreadState"
 
 #include <hwbinder/IPCThreadState.h>
-#include <binderthreadstate/IPCThreadStateBase.h>
 
 #include <hwbinder/Binder.h>
 #include <hwbinder/BpHwBinder.h>
@@ -765,7 +764,6 @@ IPCThreadState::IPCThreadState()
 
     // TODO(b/67742352): remove this variable from the class
     (void)mMyThreadId;
-    mIPCThreadStateBase = IPCThreadStateBase::self();
 }
 
 IPCThreadState::~IPCThreadState()
@@ -1116,9 +1114,6 @@ status_t IPCThreadState::executeCommand(int32_t cmd)
                 "Not enough command data for brTRANSACTION");
             if (result != NO_ERROR) break;
 
-            // Record the fact that we're in a hwbinder call
-            mIPCThreadStateBase->pushCurrentState(
-                IPCThreadStateBase::CallState::HWBINDER);
             Parcel buffer;
             buffer.ipcSetDataReference(
                 reinterpret_cast<const uint8_t*>(tr.data.ptr.buffer),
@@ -1182,7 +1177,6 @@ status_t IPCThreadState::executeCommand(int32_t cmd)
                 error = mContextObject->transact(tr.code, buffer, &reply, tr.flags, reply_callback);
             }
 
-            mIPCThreadStateBase->popCurrentState();
             if ((tr.flags & TF_ONE_WAY) == 0) {
                 if (!reply_sent) {
                     // Should have been a reply but there wasn't, so there
@@ -1255,11 +1249,6 @@ status_t IPCThreadState::executeCommand(int32_t cmd)
     return result;
 }
 
-bool IPCThreadState::isServingCall() const
-{
-    return mIPCThreadStateBase->getCurrentBinderCallState() == IPCThreadStateBase::CallState::HWBINDER;
-}
-
 void IPCThreadState::threadDestructor(void *st)
 {
         IPCThreadState* const self = static_cast<IPCThreadState*>(st);
-- 
cgit v1.2.3