commit e943923cd60d85d6fecbea538628aecea4401bca
author Robert Shih <robertshih@google.com> Thu Sep 03 15:49:14 2015 -0700
committer Robert Shih <robertshih@google.com> Wed Sep 09 14:13:05 2015 -0700
tree 75fa89a28033de9d2d8de38a9e99ecf600e17f8e
parent 8563e4dac9b240f7f83d97ade66dd70e4e78735f

Test whether mediaserver leaks info across invalid binder calls

Bug: 23756261
Change-Id: I884fd26e723d119830cf70f1e1c78bdf46cded08

tests/tests/security/jni/CtsSecurityJniOnLoad.cpp

diff --git a/tests/tests/security/jni/CtsSecurityJniOnLoad.cpp b/tests/tests/security/jni/CtsSecurityJniOnLoad.cpp
index c60b866..68e583f 100644
--- a/tests/tests/security/jni/CtsSecurityJniOnLoad.cpp
+++ b/tests/tests/security/jni/CtsSecurityJniOnLoad.cpp
@@ -26,6 +26,7 @@
 extern int register_android_security_cts_MMapExecutableTest(JNIEnv* env);
 extern int register_android_security_cts_AudioPolicyBinderTest(JNIEnv* env);
 extern int register_android_security_cts_EncryptionTest(JNIEnv* env);
+extern int register_android_security_cts_MediaPlayerInfoLeakTest(JNIEnv* env);
 
 jint JNI_OnLoad(JavaVM *vm, void *reserved) {
     JNIEnv *env = NULL;
@@ -70,5 +71,9 @@
         return JNI_ERR;
     }
 
+    if (register_android_security_cts_MediaPlayerInfoLeakTest(env)) {
+        return JNI_ERR;
+    }
+
     return JNI_VERSION_1_4;
 }