commit 9dbd4b0de0e2eaa553a7fff0a898b2ca1c5fa3e5
author Doris Ling <dling@google.com> Fri Jul 29 16:47:55 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jul 29 16:47:55 2016 +0000
tree ebbe1cf2cc20e82c77df411c3d75842a89235ef1
parent 869c577026d171ce1a621269dadc1362e7eaa65b
parent e8c50127dbf0fbfc32bdd9f58c1640d88e0c9547

Merge \\\"Update UI for gesture settings.\\\" into nyc-mr1-dev am: a2b693db93 am: bbe8025d14
am: e8c50127db

Change-Id: Ifc21b65602f71a44ad83ea3a0092c1e89de49bdd

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

diff --git a/src/com/android/settings/deviceinfo/ImeiInformation.java b/src/com/android/settings/deviceinfo/ImeiInformation.java
index 9ea54ea..dc6d3d7 100644
--- a/src/com/android/settings/deviceinfo/ImeiInformation.java
+++ b/src/com/android/settings/deviceinfo/ImeiInformation.java
@@ -80,15 +80,16 @@
                 }
 
                 setSummaryText(KEY_PRL_VERSION, phone.getCdmaPrlVersion());
-                removePreferenceFromScreen(KEY_IMEI_SV);
 
                 if (phone.getLteOnCdmaMode() == PhoneConstants.LTE_ON_CDMA_TRUE) {
                     // Show ICC ID and IMEI for LTE device
                     setSummaryText(KEY_ICC_ID, phone.getIccSerialNumber());
                     setSummaryTextAsDigit(KEY_IMEI, phone.getImei());
+                    setSummaryTextAsDigit(KEY_IMEI_SV, phone.getDeviceSvn());
                 } else {
                     // device is not GSM/UMTS, do not display GSM/UMTS features
                     // check Null in case no specified preference in overlay xml
+                    removePreferenceFromScreen(KEY_IMEI_SV);
                     removePreferenceFromScreen(KEY_IMEI);
                     removePreferenceFromScreen(KEY_ICC_ID);
                 }