| commit | defe0a6b9f7709680709a9eb70037ae851ddf578 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Dec 29 08:57:36 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 29 08:57:36 2020 +0000 |
| tree | 57cb15befdb6c02151ab26602cf1b84d8130cd69 | |
| parent | 6873e1948553b7e1c821cede1bce9fb3b2fe3428 [diff] | |
| parent | a1716edbb6ad14b0a2643ce09056f9d61d00c80c [diff] |
Merge "hardwareinfo: Hide hardware revision if empty" am: a1716edbb6 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1465283 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2e57028b2b4cabaa7bd9aaac6a134b54af5b3116
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