diff options
| author | Andreas Gampe <agampe@google.com> | 2014-09-24 15:56:29 -0700 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-09-24 15:56:29 -0700 |
| commit | 2a0f42b58d41d2c115ba79d98605bd73bd5ab6ef (patch) | |
| tree | da32695d1cd889eec7a31cbce4ae69e532f80ce6 /libnativebridge/tests | |
| parent | 0eed2eb64a229d83859155889fdba14b0f429dc2 (diff) | |
| parent | 64884bb1352bb76ee5fa55ac04743678bdf4b180 (diff) | |
| download | system_core-2a0f42b58d41d2c115ba79d98605bd73bd5ab6ef.zip system_core-2a0f42b58d41d2c115ba79d98605bd73bd5ab6ef.tar.gz system_core-2a0f42b58d41d2c115ba79d98605bd73bd5ab6ef.tar.bz2 | |
resolved conflicts for merge of 64884bb1 to lmp-dev-plus-aosp
Diffstat (limited to 'libnativebridge/tests')
| -rw-r--r-- | libnativebridge/tests/UnavailableNativeBridge_test.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libnativebridge/tests/UnavailableNativeBridge_test.cpp b/libnativebridge/tests/UnavailableNativeBridge_test.cpp index ec96c32..ad374a5 100644 --- a/libnativebridge/tests/UnavailableNativeBridge_test.cpp +++ b/libnativebridge/tests/UnavailableNativeBridge_test.cpp @@ -21,7 +21,7 @@ namespace android { TEST_F(NativeBridgeTest, NoNativeBridge) { EXPECT_EQ(false, NativeBridgeAvailable()); // Try to initialize. This should fail as we are not set up. - EXPECT_EQ(false, InitializeNativeBridge()); + EXPECT_EQ(false, InitializeNativeBridge(nullptr, nullptr)); EXPECT_EQ(true, NativeBridgeError()); EXPECT_EQ(false, NativeBridgeAvailable()); } |