Add binder_service_stable_android
Add a new binder service that uses the exact same service delegate as
its implementation, but exposes itself with the IUpdateEngineStable* APIs.
Note: Even though the new interface requires only one binding at a time,
race conditions for different clients are NOT handled in this CL.
Multiple binding is still possible via the unstable IUpdateEngine API
and via the Java android.os.UpdateEngine interface. Moreover, bindings
with bind(IUpdateEngineStableCallback) and bind(IUpdateEngineCallback)
are handled separately.
Test: unit test
Bug: 160996544
Change-Id: I26e8b4a58c0243d46ffcd7354d04f0c69f8fa66f
diff --git a/daemon_android.cc b/daemon_android.cc
index 1aa921f..313d7dd 100644
--- a/daemon_android.cc
+++ b/daemon_android.cc
@@ -47,16 +47,26 @@
LOG_IF(ERROR, !daemon_state_android->Initialize())
<< "Failed to initialize system state.";
+ auto binder_wrapper = android::BinderWrapper::Get();
+
// Create the Binder Service.
binder_service_ = new BinderUpdateEngineAndroidService{
daemon_state_android->service_delegate()};
- auto binder_wrapper = android::BinderWrapper::Get();
if (!binder_wrapper->RegisterService(binder_service_->ServiceName(),
binder_service_)) {
LOG(ERROR) << "Failed to register binder service.";
}
-
daemon_state_->AddObserver(binder_service_.get());
+
+ // Create the stable binder service.
+ stable_binder_service_ = new BinderUpdateEngineAndroidStableService{
+ daemon_state_android->service_delegate()};
+ if (!binder_wrapper->RegisterService(stable_binder_service_->ServiceName(),
+ stable_binder_service_)) {
+ LOG(ERROR) << "Failed to register stable binder service.";
+ }
+ daemon_state_->AddObserver(stable_binder_service_.get());
+
daemon_state_->StartUpdater();
return EX_OK;
}