Refactor daemon state and service async notification.
There are three supported IPC mechanism in this code: DBus, binder and
weave (over binder); which are mostly supported by all three platforms
Chrome OS, Brillo and Android. The exceptions are that Brillo and
Chrome OS still *require* DBus and support the others, while the new
Android daemon requires and supports only Binder.
This CL introduces two new interfaces: the ServiceObserverInterface and
the DaemonStateInterface.
The first one abstracts a service (or IPC service) into an interfcae
from the point of view of the daemon initialization and async
notifications of status changes. The second interface encapsulates the
state and main functionality of the update_engine daemon while leaving
the shared initialization in the main.cc and daemon.cc classes.
Bug: 25631949
TEST=`mmma system/update_engine` on edison-eng and aosp_arm-eng
TEST=FEATURES=test emerge-link update_engine
Change-Id: Ic15621031a153e14bdc4df8fcedbca1032e82c21
diff --git a/binder_service_brillo.h b/binder_service_brillo.h
new file mode 100644
index 0000000..99aa76b
--- /dev/null
+++ b/binder_service_brillo.h
@@ -0,0 +1,105 @@
+//
+// Copyright (C) 2016 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#ifndef UPDATE_ENGINE_BINDER_SERVICE_BRILLO_H_
+#define UPDATE_ENGINE_BINDER_SERVICE_BRILLO_H_
+
+#include <utils/Errors.h>
+
+#include <vector>
+
+#include <utils/RefBase.h>
+
+#include "update_engine/common_service.h"
+#include "update_engine/parcelable_update_engine_status.h"
+#include "update_engine/service_observer_interface.h"
+
+#include "android/brillo/BnUpdateEngine.h"
+#include "android/brillo/IUpdateEngineStatusCallback.h"
+
+namespace chromeos_update_engine {
+
+class BinderUpdateEngineBrilloService : public android::brillo::BnUpdateEngine,
+ public ServiceObserverInterface {
+ public:
+ BinderUpdateEngineBrilloService(SystemState* system_state)
+ : common_(new UpdateEngineService(system_state)) {}
+ virtual ~BinderUpdateEngineBrilloService() = default;
+
+ const char* ServiceName() const {
+ return "android.brillo.UpdateEngineService";
+ }
+
+ // ServiceObserverInterface overrides.
+ void SendStatusUpdate(int64_t last_checked_time,
+ double progress,
+ update_engine::UpdateStatus status,
+ const std::string& new_version,
+ int64_t new_size) override;
+ // Channel tracking changes are ignored.
+ void SendChannelChangeUpdate(const std::string& tracking_channel) override {}
+
+ // android::brillo::BnUpdateEngine overrides.
+ android::binder::Status AttemptUpdate(const android::String16& app_version,
+ const android::String16& omaha_url,
+ int flags) override;
+ android::binder::Status AttemptRollback(bool powerwash) override;
+ android::binder::Status CanRollback(bool* out_can_rollback) override;
+ android::binder::Status ResetStatus() override;
+ android::binder::Status GetStatus(
+ android::brillo::ParcelableUpdateEngineStatus* status);
+ android::binder::Status RebootIfNeeded() override;
+ android::binder::Status SetChannel(const android::String16& target_channel,
+ bool powerwash) override;
+ android::binder::Status GetChannel(bool get_current_channel,
+ android::String16* out_channel) override;
+ android::binder::Status SetP2PUpdatePermission(bool enabled) override;
+ android::binder::Status GetP2PUpdatePermission(
+ bool* out_p2p_permission) override;
+ android::binder::Status SetUpdateOverCellularPermission(
+ bool enabled) override;
+ android::binder::Status GetUpdateOverCellularPermission(
+ bool* out_cellular_permission) override;
+ android::binder::Status GetDurationSinceUpdate(
+ int64_t* out_duration) override;
+ android::binder::Status GetPrevVersion(
+ android::String16* out_prev_version) override;
+ android::binder::Status GetRollbackPartition(
+ android::String16* out_rollback_partition) override;
+ android::binder::Status RegisterStatusCallback(
+ const android::sp<android::brillo::IUpdateEngineStatusCallback>& callback)
+ override;
+
+ private:
+ // Generic function for dispatching to the common service.
+ template <typename... Parameters, typename... Arguments>
+ android::binder::Status CallCommonHandler(
+ bool (UpdateEngineService::*Handler)(brillo::ErrorPtr*, Parameters...),
+ Arguments... arguments);
+
+ // To be used as a death notification handler only.
+ void UnregisterStatusCallback(
+ android::brillo::IUpdateEngineStatusCallback* callback);
+
+ std::unique_ptr<UpdateEngineService> common_;
+
+ std::vector<android::sp<android::brillo::IUpdateEngineStatusCallback>>
+ callbacks_;
+};
+
+} // namespace chromeos_update_engine
+
+#endif // UPDATE_ENGINE_BINDER_SERVICE_BRILLO_H_