commit 670b3068f9c4b00d28e12c34b4b72f9290e3cb5f
author Howard Chen <howardsoc@google.com> Tue Feb 26 18:14:47 2019 +0800
committer Howard Chen <howardsoc@google.com> Fri Mar 15 09:39:32 2019 +0000
tree 2c20dbc47e41628fc0f43c07c51694e047b95161
parent ecbc0198c6f38dd94b3ee817e1fb6ecfe40a71dd

Add isGsiEnabled to GsiService

In order to re-enable the Gsi from framework, we need a method to
query the current enable status.

Bug: 125079548
Test: use the status command
Change-Id: Ia6c0ae12e2e6613f112a241d2cf5733f8bf22984

aidl/android/gsi/IGsiService.aidl

diff --git a/aidl/android/gsi/IGsiService.aidl b/aidl/android/gsi/IGsiService.aidl
index 0665223..8a0201d 100644
--- a/aidl/android/gsi/IGsiService.aidl
+++ b/aidl/android/gsi/IGsiService.aidl
@@ -92,6 +92,11 @@
     int setGsiBootable(boolean oneShot);
 
     /**
+     * @return              True if Gsi is enabled
+     */
+    boolean isGsiEnabled();
+
+    /**
      * Cancel an in-progress GSI install.
      */
     boolean cancelGsiInstall();

gsi_service.cpp

diff --git a/gsi_service.cpp b/gsi_service.cpp
index ec5f584..4984597 100644
--- a/gsi_service.cpp
+++ b/gsi_service.cpp
@@ -198,6 +198,18 @@
     return binder::Status::ok();
 }
 
+binder::Status GsiService::isGsiEnabled(bool* _aidl_return) {
+    ENFORCE_SYSTEM_OR_SHELL;
+    std::lock_guard<std::mutex> guard(main_lock_);
+    std::string boot_key;
+    if (!GetInstallStatus(&boot_key)) {
+        *_aidl_return = false;
+    } else {
+        *_aidl_return = (boot_key == kInstallStatusOk);
+    }
+    return binder::Status::ok();
+}
+
 binder::Status GsiService::removeGsiInstall(bool* _aidl_return) {
     ENFORCE_SYSTEM_OR_SHELL;
     std::lock_guard<std::mutex> guard(main_lock_);

gsi_service.h

diff --git a/gsi_service.h b/gsi_service.h
index f3cbad0..01326b5 100644
--- a/gsi_service.h
+++ b/gsi_service.h
@@ -49,6 +49,7 @@
                                             bool* _aidl_return) override;
     binder::Status cancelGsiInstall(bool* _aidl_return) override;
     binder::Status setGsiBootable(bool oneShot, int* _aidl_return) override;
+    binder::Status isGsiEnabled(bool* _aidl_return) override;
     binder::Status removeGsiInstall(bool* _aidl_return) override;
     binder::Status disableGsiInstall(bool* _aidl_return) override;
     binder::Status isGsiRunning(bool* _aidl_return) override;

gsi_tool.cpp

diff --git a/gsi_tool.cpp b/gsi_tool.cpp
index df2fcd5..a9a6920 100644
--- a/gsi_tool.cpp
+++ b/gsi_tool.cpp
@@ -342,7 +342,6 @@
         return EX_SOFTWARE;
     } else if (running) {
         std::cout << "running" << std::endl;
-        return 0;
     }
     bool installed;
     status = gsid->isGsiInstalled(&installed);
@@ -351,9 +350,17 @@
         return EX_SOFTWARE;
     } else if (installed) {
         std::cout << "installed" << std::endl;
-        return 0;
     }
-    std::cout << "normal" << std::endl;
+    bool enabled;
+    status = gsid->isGsiEnabled(&enabled);
+    if (!status.isOk()) {
+        std::cerr << status.exceptionMessage().string() << std::endl;
+        return EX_SOFTWARE;
+    } else if (running || installed) {
+        std::cout << (enabled ? "enabled" : "disabled") << std::endl;
+    } else {
+        std::cout << "normal" << std::endl;
+    }
     return 0;
 }