Merge "Update for providing architecture info in IBase::getDebugInfo()."
diff --git a/TokenManager.cpp b/TokenManager.cpp
index 0905cb9..6db62aa 100644
--- a/TokenManager.cpp
+++ b/TokenManager.cpp
@@ -19,7 +19,7 @@
token = generateToken();
} while (mMap.find(token) != mMap.end()); // unlikely to ever happen
- mMap[token] = wp<IBase>(store);
+ mMap[token] = store;
return token;
}
@@ -41,14 +41,7 @@
return nullptr;
}
- const wp<IBase> &wp = it->second;
- const sp<IBase> strong = wp.promote();
-
- if (strong == nullptr) {
- mMap.erase(it);
- return nullptr;
- }
- return strong;
+ return it->second;
}
uint64_t TokenManager::generateToken() {
diff --git a/TokenManager.h b/TokenManager.h
index 6aad0d4..40f7bb7 100644
--- a/TokenManager.h
+++ b/TokenManager.h
@@ -32,7 +32,7 @@
uint64_t generateToken();
// TODO(b/33843007): periodic pruning of mMap
- std::unordered_map<uint64_t, wp<IBase>> mMap;
+ std::unordered_map<uint64_t, sp<IBase>> mMap;
uint64_t mTokenIndex;
uint64_t mSalt = std::chrono::duration_cast<std::chrono::nanoseconds>(
diff --git a/service.cpp b/service.cpp
index c18ce81..f20fb0e 100644
--- a/service.cpp
+++ b/service.cpp
@@ -43,7 +43,7 @@
using android::hidl::manager::V1_0::implementation::ServiceManager;
using android::hidl::token::V1_0::implementation::TokenManager;
-static std::string serviceName = "manager";
+static std::string serviceName = "default";
class BinderCallback : public LooperCallback {
public:
