commit 02f756599edd30dc548cd5c3a21732ce55fe0078
author Steven Moreland <smoreland@google.com> Tue Sep 18 14:08:30 2018 -0700
committer Steven Moreland <smoreland@google.com> Tue Sep 25 10:52:03 2018 -0700
tree 6f765e6da3c85c2d8dad004ab0da09d1fadb9f8d
parent 85eaa63b1d122790d364ae02cdc8a8c2f1e73cf3

libbinder_ndk: to/fromJavaBinder

This allows for a conversion between android.os.IBinder and AIBinder.

Bug: 111445392
Test: android.binder.cts

Change-Id: Icd3949d298bf602f7d24dc5ec92048df902095cb

libs/binder/ndk/test/Android.bp

diff --git a/libs/binder/ndk/test/Android.bp b/libs/binder/ndk/test/Android.bp
index d242138..8e40a01 100644
--- a/libs/binder/ndk/test/Android.bp
+++ b/libs/binder/ndk/test/Android.bp
@@ -44,6 +44,7 @@
     name: "test_libbinder_ndk_test_defaults",
     defaults: ["test_libbinder_ndk_defaults"],
     shared_libs: [
+        "libandroid_runtime",
         "libbase",
         "libbinder",
         "libutils",

libs/binder/ndk/test/main_client.cpp

diff --git a/libs/binder/ndk/test/main_client.cpp b/libs/binder/ndk/test/main_client.cpp
index c07462e..3fc096a 100644
--- a/libs/binder/ndk/test/main_client.cpp
+++ b/libs/binder/ndk/test/main_client.cpp
@@ -15,6 +15,7 @@
  */
 
 #include <android-base/logging.h>
+#include <android/binder_ibinder_jni.h>
 #include <android/binder_manager.h>
 #include <android/binder_process.h>
 #include <gtest/gtest.h>
@@ -102,6 +103,11 @@
     AIBinder_decStrong(binderB);
 }
 
+TEST(NdkBinder, ToFromJavaNullptr) {
+    EXPECT_EQ(nullptr, AIBinder_toJavaBinder(nullptr, nullptr));
+    EXPECT_EQ(nullptr, AIBinder_fromJavaBinder(nullptr, nullptr));
+}
+
 TEST(NdkBinder, ABpBinderRefCount) {
     AIBinder* binder = AServiceManager_getService(kExistingNonNdkService);
     AIBinder_Weak* wBinder = AIBinder_Weak_new(binder);