Use new API Build.getSerial() to get serial number.

Bug: 32935486
Test: RunSettingsRoboTests
Change-Id: I28b8d27d034b4a6c4ae5f29e8311e84e5c423967

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

@@ -16,9 +16,6 @@
 
 package com.android.settings.deviceinfo;
 
-import static android.content.Context.CONNECTIVITY_SERVICE;
-import static android.content.Context.WIFI_SERVICE;
-
 import android.bluetooth.BluetoothAdapter;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -28,7 +25,6 @@ import android.content.res.Resources;
 import android.net.ConnectivityManager;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
@@ -36,6 +32,7 @@ import android.os.SystemClock;
 import android.os.SystemProperties;
 import android.os.UserManager;
 import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
 import android.text.TextUtils;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
@@ -46,6 +43,9 @@ import com.android.settings.Utils;
 
 import java.lang.ref.WeakReference;
 
+import static android.content.Context.CONNECTIVITY_SERVICE;
+import static android.content.Context.WIFI_SERVICE;
+
 /**
  * Display the following information
  * # Battery Strength  : TODO
@@ -61,7 +61,6 @@ public class Status extends SettingsPreferenceFragment {
     private static final String KEY_IP_ADDRESS = "wifi_ip_address";
     private static final String KEY_WIFI_MAC_ADDRESS = "wifi_mac_address";
     private static final String KEY_BT_ADDRESS = "bt_address";
-    private static final String KEY_SERIAL_NUMBER = "serial_number";
     private static final String KEY_WIMAX_MAC_ADDRESS = "wimax_mac_address";
     private static final String KEY_SIM_STATUS = "sim_status";
     private static final String KEY_IMEI_INFO = "imei_info";
@@ -83,9 +82,10 @@ public class Status extends SettingsPreferenceFragment {
 
     private Resources mRes;
 
-    private String mUnknown;
     private String mUnavailable;
 
+    private SerialNumberPreferenceController mSerialNumberPreferenceController;
+
     private Preference mUptime;
     private Preference mBatteryStatus;
     private Preference mBatteryLevel;
@@ -93,7 +93,6 @@ public class Status extends SettingsPreferenceFragment {
     private Preference mIpAddress;
     private Preference mWifiMacAddress;
     private Preference mWimaxMacAddress;
-
     private Handler mHandler;
 
     private static class MyHandler extends Handler {
@@ -162,6 +161,7 @@ public class Status extends SettingsPreferenceFragment {
 
         mCM = (ConnectivityManager) getSystemService(CONNECTIVITY_SERVICE);
         mWifiManager = (WifiManager) getSystemService(WIFI_SERVICE);
+        mSerialNumberPreferenceController = new SerialNumberPreferenceController(getActivity());
 
         addPreferencesFromResource(R.xml.device_info_status);
         mBatteryLevel = findPreference(KEY_BATTERY_LEVEL);
@@ -172,19 +172,18 @@ public class Status extends SettingsPreferenceFragment {
         mIpAddress = findPreference(KEY_IP_ADDRESS);
 
         mRes = getResources();
-        mUnknown = mRes.getString(R.string.device_info_default);
         mUnavailable = mRes.getString(R.string.status_unavailable);
 
         // Note - missing in zaku build, be careful later...
         mUptime = findPreference("up_time");
-
+        final PreferenceScreen screen = getPreferenceScreen();
         if (!hasBluetooth()) {
-            getPreferenceScreen().removePreference(mBtAddress);
+            screen.removePreference(mBtAddress);
             mBtAddress = null;
         }
 
         if (!hasWimax()) {
-            getPreferenceScreen().removePreference(mWimaxMacAddress);
+            screen.removePreference(mWimaxMacAddress);
             mWimaxMacAddress = null;
         }
 
@@ -195,12 +194,7 @@ public class Status extends SettingsPreferenceFragment {
 
         updateConnectivity();
 
-        String serial = Build.SERIAL;
-        if (serial != null && !serial.equals("")) {
-            setSummaryText(KEY_SERIAL_NUMBER, serial);
-        } else {
-            removePreferenceFromScreen(KEY_SERIAL_NUMBER);
-        }
+        mSerialNumberPreferenceController.displayPreference(screen);
 
         // Remove SimStatus and Imei for Secondary user as it access Phone b/19165700
         // Also remove on Wi-Fi only devices.
@@ -247,30 +241,6 @@ public class Status extends SettingsPreferenceFragment {
         }
     }
 
-    /**
-     * @param preference The key for the Preference item
-     * @param property The system property to fetch
-     * @param alt The default value, if the property doesn't exist
-     */
-    private void setSummary(String preference, String property, String alt) {
-        try {
-            findPreference(preference).setSummary(
-                    SystemProperties.get(property, alt));
-        } catch (RuntimeException e) {
-
-        }
-    }
-
-    private void setSummaryText(String preference, String text) {
-            if (TextUtils.isEmpty(text)) {
-               text = mUnknown;
-             }
-             // some preferences may be missing
-             if (findPreference(preference) != null) {
-                 findPreference(preference).setSummary(text);
-             }
-    }
-
     private void setWimaxStatus() {
         if (mWimaxMacAddress != null) {
             String macAddress = SystemProperties.get("net.wimax.mac.address", mUnavailable);