Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e7731d9 authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge changes Ibfa0535f,Idc771d8e am: 6bbc472a am: 94523918 am: f33abc0f... 

Merge changes Ibfa0535f,Idc771d8e am: 6bbc472a am: 94523918 am: f33abc0f am: d5b405f3 am: 5fb57fa9

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2081789



Change-Id: Ic120cbb4af32da111ba9d0fe4e3aef3a8a1ee13e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0355f16e 5fb57fa9

libs/binder/BpBinder.cpp

+1 −1
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ status_t BpBinder::transact( 
    if (mAlive) {

        bool privateVendor = flags & FLAG_PRIVATE_VENDOR;

        // don't send userspace flags to the kernel

        flags = flags & ~FLAG_PRIVATE_VENDOR;

        flags = flags & ~static_cast<uint32_t>(FLAG_PRIVATE_VENDOR);



        // user transactions require a given stability level

        if (code >= FIRST_CALL_TRANSACTION && code <= LAST_CALL_TRANSACTION) {

libs/binder/RpcSession.cpp

+2 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
#include "RpcWireFormat.h"

#include "Utils.h"



#ifndef __ANDROID_RECOVERY__

#if defined(__ANDROID__) && !defined(__ANDROID_RECOVERY__)

#include <android_runtime/vm.h>

#include <jni.h>

#endif
@@ -316,7 +316,7 @@ RpcSession::PreJoinSetupResult RpcSession::preJoinSetup( 
}



namespace {

#ifdef __ANDROID_RECOVERY__

#if !defined(__ANDROID__) || defined(__ANDROID_RECOVERY__)

class JavaThreadAttacher {};

#else

// RAII object for attaching / detaching current thread to JVM if Android Runtime exists. If