commit 01871ab4151c5736b202ab74664976b55f77802d
author Howard Chen <howardsoc@google.com> Thu Mar 19 18:55:55 2020 +0800
committer Howard Chen <howardsoc@google.com> Sun Apr 05 11:42:20 2020 +0800
tree f23215fc32d9adce45dd5f290f800bc5ebbf67ba
parent 1a847190416896d755bc571a4d3d855e0224cb61

Hide the DSULoader when DSU is running

Bug: 151792130
Test: open developer settings and check the DSULoader
    make -j32 RunSettingsRoboTests
Change-Id: I8f82e0f7ddbfd2c50ac6e2a2d3f61f7715ba452c

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index b789907..a6d3ab7 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -11745,6 +11745,8 @@
     <string name="dsu_loader_description" translatable="false">Load a Dynamic System Update Image</string>
     <!-- DSU Loader Loading. Do not translate. -->
     <string name="dsu_loader_loading" translatable="false">Loading...</string>
+    <!-- DSU Loader. Do not translate. -->
+    <string name="dsu_is_running" translatable="false">DSU is running</string>
 
     <!-- Name of dev option called "Bug report handler" [CHAR LIMIT=NONE] -->
     <string name="bug_report_handler_title">Bug report handler</string>

src/com/android/settings/development/SelectDSUPreferenceController.java

diff --git a/src/com/android/settings/development/SelectDSUPreferenceController.java b/src/com/android/settings/development/SelectDSUPreferenceController.java
index 72e8447..6498ae7 100644
--- a/src/com/android/settings/development/SelectDSUPreferenceController.java
+++ b/src/com/android/settings/development/SelectDSUPreferenceController.java
@@ -18,6 +18,7 @@
 
 import android.content.Context;
 import android.content.Intent;
+import android.os.SystemProperties;
 
 import androidx.preference.Preference;
 
@@ -37,9 +38,16 @@
         return DSU_LOADER_KEY;
     }
 
+    private boolean isDSURunning() {
+        return SystemProperties.getBoolean("ro.gsid.image_running", false);
+    }
+
     @Override
     public boolean handlePreferenceTreeClick(Preference preference) {
         if (DSU_LOADER_KEY.equals(preference.getKey())) {
+            if (isDSURunning()) {
+                return true;
+            }
             final Intent intent = new Intent(mContext, DSULoader.class);
             mContext.startActivity(intent);
             return true;
@@ -49,6 +57,7 @@
 
     @Override
     public void updateState(Preference preference) {
-        preference.setSummary(mContext.getResources().getString(R.string.dsu_loader_description));
+        int key = isDSURunning() ? R.string.dsu_is_running : R.string.dsu_loader_description;
+        preference.setSummary(mContext.getResources().getString(key));
     }
 }