Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 581573f0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "hardwareinfo: Hide hardware revision if empty" am: a1716edb am: defe0a6b am: 8dc014e9 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1465283

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I077de332388b35b1177853d0f590ae0b4ea7d29f
parents ba98c52c 8dc014e9

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

+3 −2
Original line number Diff line number Diff line
@@ -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