Snap for 8202755 from 090198bb079e118fb913eaa5618c45bd87cbf6fa to tm-release

Change-Id: I3744916ffbfe36135291e2126388f306bfe25e9c

2 files changed, 14 insertions, 0 deletions

diff --git a/aidl/android/gsi/IImageService.aidl b/aidl/android/gsi/IImageService.aidl
index c8c5a9d..363a919 100644
--- a/aidl/android/gsi/IImageService.aidl
+++ b/aidl/android/gsi/IImageService.aidl
@@ -135,6 +135,11 @@ interface IImageService {
     void removeDisabledImages();
 
     /**
+     * Return whether an image is disabled.
+     */
+    boolean isImageDisabled(@utf8InCpp String name);
+
+    /**
      * Return the block device path of a mapped image, or an empty string if not mapped.
      */
     @utf8InCpp String getMappedImageDevice(@utf8InCpp String name);
diff --git a/gsi_service.cpp b/gsi_service.cpp
index c7b3a28..122bbf6 100644
--- a/gsi_service.cpp
+++ b/gsi_service.cpp
@@ -594,6 +594,7 @@ class ImageService : public BinderService<ImageService>, public BnImageService {
     binder::Status removeAllImages() override;
     binder::Status removeDisabledImages() override;
     binder::Status getMappedImageDevice(const std::string& name, std::string* device) override;
+    binder::Status isImageDisabled(const std::string& name, bool* _aidl_return) override;
 
   private:
     bool CheckUid();
@@ -764,6 +765,14 @@ binder::Status ImageService::removeDisabledImages() {
     return binder::Status::ok();
 }
 
+binder::Status ImageService::isImageDisabled(const std::string& name, bool* _aidl_return) {
+    if (!CheckUid()) return UidSecurityError();
+
+    std::lock_guard<std::mutex> guard(service_->lock());
+    *_aidl_return = impl_->IsImageDisabled(name);
+    return binder::Status::ok();
+}
+
 binder::Status ImageService::getMappedImageDevice(const std::string& name, std::string* device) {
     if (!CheckUid()) return UidSecurityError();