commit a1716edbb6ad14b0a2643ce09056f9d61d00c80c
author Treehugger Robot <treehugger-gerrit@google.com> Tue Dec 29 08:21:35 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Dec 29 08:21:35 2020 +0000
tree 8efdd25445212427b7e7cfc91e84dedad62f6940
parent b92cb6678cfc77629b6965f96b49b13de2f89d47
parent 55cab10c313790fdb8a57eaa39ace55eeec9344c

Merge "hardwareinfo: Hide hardware revision if empty"

src/com/android/settings/deviceinfo/hardwareinfo/HardwareRevisionPreferenceController.java

diff --git a/src/com/android/settings/deviceinfo/hardwareinfo/HardwareRevisionPreferenceController.java b/src/com/android/settings/deviceinfo/hardwareinfo/HardwareRevisionPreferenceController.java
index 955c60c..e5fd3da 100644
--- a/src/com/android/settings/deviceinfo/hardwareinfo/HardwareRevisionPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/hardwareinfo/HardwareRevisionPreferenceController.java
@@ -18,6 +18,7 @@
 
 import android.content.Context;
 import android.os.SystemProperties;
+import android.text.TextUtils;
 
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
@@ -31,8 +32,8 @@
 
     @Override
     public int getAvailabilityStatus() {
-        return mContext.getResources().getBoolean(R.bool.config_show_device_model)
-                ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+        return mContext.getResources().getBoolean(R.bool.config_show_device_model) &&
+                !TextUtils.isEmpty(getSummary()) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override