Merge "Always include BAND_MODE=AUTOMATIC in the Radio Band Mode List" am: c98ca3da26 am: 9b0c6a525d

am: f44fd8d98d

Change-Id: I6845ff460b0b2d7c1960568b920685673dcba6fc

src/com/android/settings/BandMode.java

@@ -164,7 +164,12 @@ public class BandMode extends Activity {
             int size = bands[0];
 
             if (size > 0) {
+                mBandListAdapter.add(
+                        new BandListItem(Phone.BM_UNSPECIFIED)); //Always include AUTOMATIC
                 for (int i=1; i<=size; i++) {
+                    if (bands[i] == Phone.BM_UNSPECIFIED) {
+                        continue;
+                    }
                     item = new BandListItem(bands[i]);
                     mBandListAdapter.add(item);
                     if (DBG) log("Add " + item.toString());