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

am: dae6785ca2 Change-Id: I3465c48eca9e7f6659363949e3984eadb80c0b9a
2019-07-26 08:25:44 -07:00 · 2019-07-26 08:25:44 -07:00 · b4d840eb74
commit b4d840eb74
parent 786fe9c151 dae6785ca2
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"));
        }));
  }