diff options
| author | 2020-07-09 17:19:18 +0000 | |
|---|---|---|
| committer | 2020-07-09 17:19:18 +0000 | |
| commit | cd5a2a3037fcda5836affe7aeae8c2e8070bc288 (patch) | |
| tree | 3185f6d8d7fd93b9105ea4b7b0b37eb13a91e084 | |
| parent | 4ffd88f7a3f446715bcbde055a0bcabc60e9fb70 (diff) | |
| parent | 8b6e909cbf80461300c944098a392e3e0cd3ef11 (diff) | |
Merge "HwBinder.setTrebleTestingOverride" am: 3804ae082c am: 8b6e909cbf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1358164
Change-Id: Ia8da014470547dc469b2de12700aa57fea4c9af1
| -rw-r--r-- | core/java/android/os/HwBinder.java | 9 | ||||
| -rw-r--r-- | core/jni/android_os_HwBinder.cpp | 7 |
2 files changed, 16 insertions, 0 deletions
diff --git a/core/java/android/os/HwBinder.java b/core/java/android/os/HwBinder.java index 7c42c36e7747..64ab1d711765 100644 --- a/core/java/android/os/HwBinder.java +++ b/core/java/android/os/HwBinder.java @@ -96,6 +96,15 @@ public abstract class HwBinder implements IHwBinder { throws RemoteException, NoSuchElementException; /** + * This allows getService to bypass the VINTF manifest for testing only. + * + * Disabled on user builds. + * @hide + */ + public static native final void setTrebleTestingOverride( + boolean testingOverride); + + /** * Configures how many threads the process-wide hwbinder threadpool * has to process incoming requests. * diff --git a/core/jni/android_os_HwBinder.cpp b/core/jni/android_os_HwBinder.cpp index b6427c9aa01c..48f33a6a3d77 100644 --- a/core/jni/android_os_HwBinder.cpp +++ b/core/jni/android_os_HwBinder.cpp @@ -339,6 +339,10 @@ static jobject JHwBinder_native_getService( return JHwRemoteBinder::NewObject(env, service); } +void JHwBinder_native_setTrebleTestingOverride(JNIEnv*, jclass, jboolean testingOverride) { + hardware::details::setTrebleTestingOverride(testingOverride); +} + void JHwBinder_native_configureRpcThreadpool(JNIEnv *, jclass, jlong maxThreads, jboolean callerWillJoin) { CHECK(maxThreads > 0); @@ -368,6 +372,9 @@ static JNINativeMethod gMethods[] = { { "getService", "(Ljava/lang/String;Ljava/lang/String;Z)L" PACKAGE_PATH "/IHwBinder;", (void *)JHwBinder_native_getService }, + { "setTrebleTestingOverride", "(Z)V", + (void *)JHwBinder_native_setTrebleTestingOverride }, + { "configureRpcThreadpool", "(JZ)V", (void *)JHwBinder_native_configureRpcThreadpool }, |