Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Binder: allow stability downgrade" am: 7236cf6dca am: 0852de16cb am: e86ea5d7d4

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1651544

Change-Id: Icb13c0c97fb72d56c0212fe2ec4100653c454bd4
This commit is contained in:
Steven Moreland
2021-03-26 03:58:18 +00:00
committed by Automerger Merge Worker
parent 6264987a00 e86ea5d7d4
commit 32f27edf97
2 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/os/Binder.java
View File

@@ -549,6 +549,16 @@ public class Binder implements IBinder {
@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
public final native void markVintfStability();
/**
* Use a VINTF-stability binder w/o VINTF requirements. Should be called
* on a binder before it is sent out of process.
*
* This must be called before the object is sent to another process.
*
* @hide
*/
public final native void forceDowngradeToSystemStability();
/**
* Flush any Binder commands pending in the current thread to the kernel
* driver. This can be

13
core/jni/android_util_Binder.cpp
View File

@@ -487,9 +487,15 @@ public:
}
void markVintf() {
AutoMutex _l(mLock);
mVintf = true;
}
void forceDowngradeToSystemStability() {
AutoMutex _l(mLock);
mVintf = false;
}
sp<IBinder> getExtension() {
AutoMutex _l(mLock);
sp<JavaBBinder> b = mBinder.promote();
@@ -1005,6 +1011,12 @@ static void android_os_Binder_markVintfStability(JNIEnv* env, jobject clazz) {
jbh->markVintf();
}
static void android_os_Binder_forceDowngradeToSystemStability(JNIEnv* env, jobject clazz) {
JavaBBinderHolder* jbh =
(JavaBBinderHolder*) env->GetLongField(clazz, gBinderOffsets.mObject);
jbh->forceDowngradeToSystemStability();
}
static void android_os_Binder_flushPendingCommands(JNIEnv* env, jobject clazz)
{
IPCThreadState::self()->flushCommands();
@@ -1069,6 +1081,7 @@ static const JNINativeMethod gBinderMethods[] = {
{ "clearCallingWorkSource", "()J", (void*)android_os_Binder_clearCallingWorkSource },
{ "restoreCallingWorkSource", "(J)V", (void*)android_os_Binder_restoreCallingWorkSource },
{ "markVintfStability", "()V", (void*)android_os_Binder_markVintfStability},
{ "forceDowngradeToSystemStability", "()V", (void*)android_os_Binder_forceDowngradeToSystemStability},
{ "flushPendingCommands", "()V", (void*)android_os_Binder_flushPendingCommands },
{ "getNativeBBinderHolder", "()J", (void*)android_os_Binder_getNativeBBinderHolder },
{ "getNativeFinalizer", "()J", (void*)android_os_Binder_getNativeFinalizer },