Merge change 1582 into donut

* changes:
  Teleca 2b changes.

src/com/android/settings/RadioInfo.java

@@ -625,6 +625,9 @@ public class RadioInfo extends Activity {
     
     private final void
     updateSignalStrength() {
+        // TODO TELECA: PhoneStateIntentReceiver deprecated, use TelephonyManager or
+        // PhoneStateListener instead.
+        // Use new SignalStrength for signal
         int state =
                 mPhoneStateReceiver.getServiceState().getState();
         Resources r = getResources();
@@ -1173,7 +1176,7 @@ public class RadioInfo extends Activity {
             mPreferredNetworkHandler = new AdapterView.OnItemSelectedListener() {
         public void onItemSelected(AdapterView parent, View v, int pos, long id) {
             Message msg = mHandler.obtainMessage(EVENT_SET_PREFERRED_TYPE_DONE);
-            if (pos>=0 && pos<=2) {
+            if (pos>=0 && pos<=7) { //IS THIS NEEDED to extend to the entire range of values
                 phone.setPreferredNetworkType(pos, msg);
             }
         }

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

@@ -303,6 +303,10 @@ public class Status extends PreferenceActivity {
     }
     
     void updateSignalStrength() {
+        // TODO TELECA: PhoneStateIntentReceiver deprecated, use TelephonyManager or
+        // PhoneStateListener instead.
+        // Use new SignalStrength for signal
+
         // not loaded in some versions of the code (e.g., zaku)
         if (mSignalStrength != null) {
             int state =