From 9514b203cf79a988f45908d63ca6c9223fca4a12 Mon Sep 17 00:00:00 2001
From: Steven Moreland <smoreland@google.com>
Date: Mon, 21 Sep 2020 18:03:27 +0000
Subject: Reland "libbinder: ignore CallRestriction for magic 0 cmd"

This reverts commit 41a4c36712b23aff58d9305e4191dc18d143f6bd.

This fixes the CallRestriction issue, but removes the added test
which has problems in another context and will be fixed separately.

Reason for revert: refix b/167302413
Testing issue will be handled separately in b/168942807.

Fixes: 167302413

Change-Id: Iedc1ff73d086c973bfcab511ace26d0ec2291040
---
 libs/binder/IPCThreadState.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'libs/binder/IPCThreadState.cpp')

diff --git a/libs/binder/IPCThreadState.cpp b/libs/binder/IPCThreadState.cpp
index 0c71ed81a4..33e7d479fd 100644
--- a/libs/binder/IPCThreadState.cpp
+++ b/libs/binder/IPCThreadState.cpp
@@ -448,6 +448,14 @@ int32_t IPCThreadState::getLastTransactionBinderFlags() const
     return mLastTransactionBinderFlags;
 }
 
+void IPCThreadState::setCallRestriction(ProcessState::CallRestriction restriction) {
+    mCallRestriction = restriction;
+}
+
+ProcessState::CallRestriction IPCThreadState::getCallRestriction() const {
+    return mCallRestriction;
+}
+
 void IPCThreadState::restoreCallingIdentity(int64_t token)
 {
     mCallingUid = (int)(token>>32);
-- 
cgit v1.2.3-59-g8ed1b