Merge "Don't fail catastrophically on non-existing namespace" am: d11603646a am: b931f21570 am: dae6785ca2

am: b4d840eb74 Change-Id: I04bf30c62f9d51465135e35dec3a5f4febd8802a
2019-07-26 08:35:44 -07:00 · 2019-07-26 08:35:44 -07:00 · 8d058d4b3c
commit 8d058d4b3c
parent 8b0ba102ed b4d840eb74
1 changed files with 1 additions and 1 deletions
--- a/libnativeloader/native_loader_test.cpp
+++ b/libnativeloader/native_loader_test.cpp
@ -99,7 +99,7 @@ class MockPlatform : public Platform {
          if (namespaces.find(name) != namespaces.end()) {
            return namespaces[name];
          }
-          return nullptr;
+          return TO_MOCK_NAMESPACE(TO_ANDROID_NAMESPACE("(namespace not found"));
        }));
  }