From 55cab10c313790fdb8a57eaa39ace55eeec9344c Mon Sep 17 00:00:00 2001 From: Arian Kulmer Date: Sun, 17 May 2020 16:20:14 +0200 Subject: [PATCH] hardwareinfo: Hide hardware revision if empty Test: Hardware version is hidden when ro.boot.hardware.revision is unset and shown when it is set. Change-Id: I6135ce48ea76f3181489c40b1c9227de53c43683 --- .../hardwareinfo/HardwareRevisionPreferenceController.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/deviceinfo/hardwareinfo/HardwareRevisionPreferenceController.java b/src/com/android/settings/deviceinfo/hardwareinfo/HardwareRevisionPreferenceController.java index 955c60c8ff0..e5fd3daa943 100644 --- a/src/com/android/settings/deviceinfo/hardwareinfo/HardwareRevisionPreferenceController.java +++ b/src/com/android/settings/deviceinfo/hardwareinfo/HardwareRevisionPreferenceController.java @@ -18,6 +18,7 @@ package com.android.settings.deviceinfo.hardwareinfo; 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 @@ public class HardwareRevisionPreferenceController extends BasePreferenceControll @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