Replace several IPCThreadState::get() lookups with one.
Also, make StrictMode's ThreadLocal final. Change-Id: I08d400ed254fa67bb7a3dae1227f205a54c00df0
This commit is contained in:
parent
23abef82b6
commit
70081a1511
|
@ -26,11 +26,12 @@
|
|||
// ---------------------------------------------------------------------------
|
||||
namespace android {
|
||||
|
||||
class Flattenable;
|
||||
class IBinder;
|
||||
class IPCThreadState;
|
||||
class ProcessState;
|
||||
class String8;
|
||||
class TextOutput;
|
||||
class Flattenable;
|
||||
|
||||
struct flat_binder_object; // defined in support_p/binder_module.h
|
||||
|
||||
|
@ -61,10 +62,13 @@ public:
|
|||
|
||||
// Parses the RPC header, returning true if the interface name
|
||||
// in the header matches the expected interface from the caller.
|
||||
// If strict_policy_out is non-NULL, the RPC header's StrictMode policy
|
||||
// mask is returned.
|
||||
//
|
||||
// Additionally, enforceInterface does part of the work of
|
||||
// propagating the StrictMode policy mask, populating the current
|
||||
// IPCThreadState, which as an optimization may optionally be
|
||||
// passed in.
|
||||
bool enforceInterface(const String16& interface,
|
||||
int32_t* strict_policy_out = NULL) const;
|
||||
IPCThreadState* threadState = NULL) const;
|
||||
bool checkInterface(IBinder*) const;
|
||||
|
||||
void freeData();
|
||||
|
|
|
@ -458,13 +458,13 @@ bool Parcel::checkInterface(IBinder* binder) const
|
|||
}
|
||||
|
||||
bool Parcel::enforceInterface(const String16& interface,
|
||||
int32_t* strict_policy_out) const
|
||||
IPCThreadState* threadState) const
|
||||
{
|
||||
int32_t strict_policy = readInt32();
|
||||
IPCThreadState::self()->setStrictModePolicy(strict_policy);
|
||||
if (strict_policy_out != NULL) {
|
||||
*strict_policy_out = strict_policy;
|
||||
int32_t strictPolicy = readInt32();
|
||||
if (threadState == NULL) {
|
||||
threadState = IPCThreadState::self();
|
||||
}
|
||||
threadState->setStrictModePolicy(strictPolicy);
|
||||
const String16 str(readString16());
|
||||
if (str == interface) {
|
||||
return true;
|
||||
|
|
Loading…
Reference in New Issue