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

Commit 94e4f9bd authored by Arne Coucheron's avatar Arne Coucheron
Browse files

Revert "Settings: Display 14 digit IMEI(Ignore Check Digit)" 

This reverts commit 101d60ed.

Change-Id: I824a456339f53602870b810ee2d865ee2d0446ac
parent 1659bf0c

src/com/android/settings/deviceinfo/ImeiInformation.java

+2 −26
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ import android.content.Context; 
import android.os.Bundle;

import android.support.v7.preference.Preference;

import android.support.v7.preference.PreferenceScreen;

import android.telephony.CarrierConfigManager;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import android.text.Spannable;
@@ -47,7 +46,6 @@ public class ImeiInformation extends SettingsPreferenceFragment { 


    private SubscriptionManager mSubscriptionManager;

    private boolean isMultiSIM = false;

    private static final int IMEI_14_DIGIT = 14;



    @Override

    public void onCreate(Bundle savedInstanceState) {
@@ -71,30 +69,8 @@ public class ImeiInformation extends SettingsPreferenceFragment { 


    private void setPreferenceValue(int phoneId) {

        final Phone phone = PhoneFactory.getPhone(phoneId);

        String imeiStr =  null;

        boolean enable14DigitImei = false;

        try {

            CarrierConfigManager configManager =

                    (CarrierConfigManager) getContext().getSystemService(

                     Context.CARRIER_CONFIG_SERVICE);

            int[] subIds = SubscriptionManager.getSubId(phoneId);

            if (configManager != null &&

                    configManager.getConfigForSubId(subIds[0]) != null) {

                enable14DigitImei =

                        configManager.getConfigForSubId(subIds[0]).getBoolean(

                        "config_enable_display_14digit_imei");

            }

        } catch(RuntimeException ex) {

            //do Nothing

        }



        if (phone != null) {

            imeiStr = phone.getImei();

            if (enable14DigitImei &&

                     imeiStr != null && imeiStr.length() > 14) {

                imeiStr = imeiStr.substring(0, IMEI_14_DIGIT);

            }



            if (phone.getPhoneType() == TelephonyManager.PHONE_TYPE_CDMA) {

                setSummaryText(KEY_MEID_NUMBER, phone.getMeid());

                setSummaryText(KEY_MIN_NUMBER, phone.getCdmaMin());
@@ -108,7 +84,7 @@ public class ImeiInformation extends SettingsPreferenceFragment { 
                if (phone.getLteOnCdmaMode() == PhoneConstants.LTE_ON_CDMA_TRUE) {

                    // Show ICC ID and IMEI for LTE device

                    setSummaryText(KEY_ICC_ID, phone.getIccSerialNumber());

                    setSummaryText(KEY_IMEI, imeiStr);

                    setSummaryText(KEY_IMEI, phone.getImei());

                    setSummaryTextAsDigit(KEY_IMEI, phone.getImei());

                    setSummaryTextAsDigit(KEY_IMEI_SV, phone.getDeviceSvn());

                } else {
@@ -126,7 +102,7 @@ public class ImeiInformation extends SettingsPreferenceFragment { 
                } else {

                    removePreferenceFromScreen(KEY_ICC_ID);

                }

                setSummaryText(KEY_IMEI, imeiStr);

                setSummaryText(KEY_IMEI, phone.getImei());

                setSummaryText(KEY_IMEI_SV, phone.getDeviceSvn());

                setSummaryTextAsDigit(KEY_IMEI, phone.getImei());

                setSummaryTextAsDigit(KEY_IMEI_SV, phone.getDeviceSvn());