Commit Graph

27 Commits

Author SHA1 Message Date
Amith Yamasani
ffe813c380 Remove phone number status conditionally for devices without voice.
Bug: 3041861

Change-Id: I36fb6c584c24b995da0ac4e3b41d860f3a6f5396
2011-01-11 12:18:28 -08:00
David Brown
f42d5e7e2e Fix 2520977: NPE in com.android.settings.deviceinfo.Status
In normal operation, Phone.getLine1Number() returns an empty string if the
device doesn't know its own phone number for some reason.  However the
monkey caught a case where it was returning null, which crashed the
Settings -> About Phone -> Status app.

However the javadoc for Phone.getLine1Number() *does* clearly say "May
return null if not available or the SIM is not ready", so the Status app
*should* gracefully handle this.

Now it does.  (We display this case as "Unknown", just like if we get an
empty string.)

FWIW I grepped thru the rest of the code base for other uses of
getLine1Number(), and everybody else *does* handle null gracefully except
for one case in apps/Mms, which I'll open a separate bug about.

Bug: 2520977
Change-Id: I173561f903f116dbdc2b7c32b8011b59a9eb29d7
2010-03-17 23:03:45 -07:00
Jeff Hamilton
f25b3e04db Format the phone number when displaying in the status settings panel.
Change-Id: I12e437696ebfa6ca8dcdc373f1387fd98e451e50
2010-03-15 17:02:40 -05:00
Nick Pelly
d1a04291c5 Update application code for BluetoothAdapter.getDefaultAdapter().
Change-Id: Ic8f2188a28631f55ceb048daff545ca5e6053f92
DrNo: eastham
Bug: 2158765
Joke: When is a car not a car? When it turns into a driveway.
2009-10-08 01:03:34 +02:00
Nick Pelly
d63c011225 Bluetooth: Update Settings.apk to match BT API change.
Split BluetoothDevice into BluetoothDevice and BluetoothAdapter.

BluetoothAdapter: Represents the local BT adapter. Operations on the local
                  adapter (start a scan, etc).
BluetoothDevice: Represents a remote BT device. Operations on remote devices
                 (pair, connect, etc).
2009-08-17 17:09:44 -07:00
John Wang
4c47009172 am ed47f1e4: Fix the NullPointerException in Status Info.
Merge commit 'ed47f1e497abf5ad31b1c7035ae04478e9932986'

* commit 'ed47f1e497abf5ad31b1c7035ae04478e9932986':
  Fix the NullPointerException in Status Info.
2009-07-30 18:58:55 -07:00
John Wang
ed47f1e497 Fix the NullPointerException in Status Info.
Fix bug 1964037 Phone states activity fail. It only happens in Zaku build. Zaku build overlay the device_info_status.xml under vendor/docomo and don't have CDMA related preference. Status.java will hit the NullPointerException when trying to remove the non-exist preferences.

	modified:   src/com/android/settings/deviceinfo/Status.java
2009-07-30 18:50:36 -07:00
Chouting Zhang
620965ccc5 am 386278a3: CDMA Settings additions
Merge commit '386278a338d740dce95b7fa1514662b0eb5683e4'

* commit '386278a338d740dce95b7fa1514662b0eb5683e4':
  CDMA Settings additions
2009-06-25 22:06:36 -07:00
Chouting Zhang
386278a338 CDMA Settings additions
This patch implement CDMA Settings features
1. Add code to get MEID, MIN, and PRL value if the phone is a CDMA Phone
2. Display MEID, MIN, and PRL on Settings screen if it is a CDMA phone
3. Do not display IMSI, IMEI, and IMEI SV for a CDMA phone
2009-06-25 22:01:32 -07:00
Wink Saville
402a740f64 am e2a14e35: Update some TODO comments.
Merge commit 'e2a14e35aa525de6cbc0179c67ec971295f2db03'

* commit 'e2a14e35aa525de6cbc0179c67ec971295f2db03':
  Update some TODO comments.
2009-06-01 14:27:01 -07:00
Wink Saville
e2a14e35aa Update some TODO comments. 2009-05-29 14:06:30 -07:00
Android (Google) Code Review
76dce58435 am 81807831: Merge change 1582 into donut
Merge commit '818078310759e3fbd227c578e20a54e935b1b92a'

* commit '818078310759e3fbd227c578e20a54e935b1b92a':
  Teleca 2b changes.
2009-05-18 23:56:38 -07:00
Wink Saville
ead6928894 Teleca 2b changes. 2009-05-15 14:08:46 -07:00
Michael Chan
8762093e00 Findbug fixes in Settings app
modified:   src/com/android/settings/ApnPreference.java
	modified:   src/com/android/settings/ApnSettings.java
	modified:   src/com/android/settings/BandMode.java
	modified:   src/com/android/settings/BatteryInfo.java
	modified:   src/com/android/settings/LanguageSettings.java
	modified:   src/com/android/settings/ManageApplications.java
	modified:   src/com/android/settings/RadioInfo.java
	modified:   src/com/android/settings/SdCardSettings.java
	modified:   src/com/android/settings/UsageStats.java
	modified:   src/com/android/settings/ZoneList.java
	modified:   src/com/android/settings/bluetooth/LocalBluetoothDevice.java
	modified:   src/com/android/settings/deviceinfo/Status.java
	modified:   src/com/android/settings/quicklaunch/QuickLaunchSettings.java
	modified:   src/com/android/settings/wifi/AccessPointDialog.java
	modified:   src/com/android/settings/wifi/AccessPointPreference.java
	modified:   src/com/android/settings/wifi/WifiLayer.java
	modified:   src/com/android/settings/wifi/WifiSettings.java
2009-05-14 17:47:02 -07:00
Wink Saville
c38866843e AI 144245: Fix merge conflict for megering in the CDMA changes in to master from donutburger.
Automated import of CL 144245
2009-04-02 11:00:56 -07:00
Wink Saville
f9e024198d AI 144185: Integrate cdma into the main code base.
Automated import of CL 144185
2009-04-02 01:37:03 -07:00
Evan Millar
5990cc129c Automated import from //branches/master/...@142436,142436 2009-03-24 22:50:12 -07:00
Evan Millar
83368552d1 Automated import from //branches/donutburger/...@142431,142431 2009-03-24 22:42:51 -07:00
Mike Ritter
d166402fc3 Automated import from //branches/donutburger/...@141180,141180 2009-03-24 19:44:13 -07:00
Mike Ritter
18f3afb9cd Automated import from //branches/master/...@141186,141186 2009-03-24 19:43:56 -07:00
The Android Open Source Project
72ed6feab2 auto import from //branches/cupcake_rel/...@138607 2009-03-13 13:04:25 -07:00
The Android Open Source Project
afc4ab2ffb auto import from //depot/cupcake/@135843 2009-03-03 19:32:34 -08:00
The Android Open Source Project
4e14e5ccbf auto import from //depot/cupcake/@135843 2009-03-03 18:28:52 -08:00
The Android Open Source Project
4772968987 auto import from //branches/cupcake/...@132276 2009-02-19 10:57:36 -08:00
The Android Open Source Project
1feaa85791 auto import from //branches/cupcake/...@130745 2009-02-10 15:44:05 -08:00
The Android Open Source Project
abc48f80d8 Code drop from //branches/cupcake/...@124589 2008-12-17 18:06:01 -08:00
The Android Open Source Project
de2d9f5f10 Initial Contribution 2008-10-21 07:00:00 -07:00