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

Commit 86f1cc1b authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Promotion of android_ui.lnx.2.1-00038. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1085926   I26e8c1e03ebc433fa201446e1a5677437bb69b8b   DeviceInfo:Add QGP Version For Global Pass Provisioning

Change-Id: I1fe946e23d7e911d1570ae83ae104cc19cb53bef
CRs-Fixed: 1085926
parents ed75d602 c252e51b

src/com/android/settings/DeviceInfoSettings.java

+29 −3
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In 
    private static final String KEY_QGP_VERSION = "qgp_version";

    private static final String PROPERTY_QGP_VERSION = "persist.qgp.version";

    private static final String MBN_VERSION_PATH = "/persist/speccfg/mbnversion";

    private static final String QGP_VERSION_PATH = "/persist/speccfg/qgpversion";



    static final int TAPS_TO_BE_A_DEVELOPER = 7;
@@ -126,10 +127,15 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In 
        setStringSummary(KEY_DEVICE_MODEL, Build.MODEL);

        setStringSummary(KEY_BUILD_NUMBER, Build.DISPLAY);

        findPreference(KEY_BUILD_NUMBER).setEnabled(true);

        setValueSummary(KEY_QGP_VERSION, PROPERTY_QGP_VERSION);

        //setValueSummary(KEY_QGP_VERSION, PROPERTY_QGP_VERSION);

        // Remove QGP Version if property is not present

        removePreferenceIfPropertyMissing(getPreferenceScreen(), KEY_QGP_VERSION,

                PROPERTY_QGP_VERSION);

        //removePreferenceIfPropertyMissing(getPreferenceScreen(), KEY_QGP_VERSION,

        //        PROPERTY_QGP_VERSION);

        String mQGPVersion = getQGPVersionValue();

        setStringSummary(KEY_QGP_VERSION, mQGPVersion);

        if(mQGPVersion == null){

            getPreferenceScreen().removePreference(findPreference(KEY_QGP_VERSION));

        }

        findPreference(KEY_KERNEL_VERSION).setSummary(DeviceInfoUtils.customizeFormatKernelVersion(

                getResources().getBoolean(R.bool.def_hide_kernel_version_name)));

        String mMbnVersion = getMBNVersionValue();
@@ -391,6 +397,26 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In 
        return mVersion;

    }



    private String getQGPVersionValue() {

        String mVersion = null;



        if (RegionalizationEnvironment.isSupported()) {

            mRegionalizationService = RegionalizationEnvironment.getRegionalizationService();

        }

        if(mRegionalizationService != null){

            try{

                if(!mRegionalizationService.checkFileExists(QGP_VERSION_PATH))

                    return null;

                if(mRegionalizationService.readFile(QGP_VERSION_PATH, "").size() > 0){

                    mVersion = mRegionalizationService.readFile(QGP_VERSION_PATH, "").get(0);

                }

                Log.d(LOG_TAG,"read QGPVersion="+mVersion);

            }catch (Exception e) {

                Log.e(LOG_TAG, "IOException:"+ e.getMessage());

            }

        }

        return mVersion;

    }

    private void setValueSummary(String preference, String property) {

        try {

            findPreference(preference).setSummary(