History log of /packages/apps/Settings/src/com/android/settings/deviceinfo/Status.java
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
b7e4380cd27ffd8a060ecb61201057fb6843e408 06-Jun-2016 Jason Monk <jmonk@google.com> Remove PreferenceActivity

Its broken and isn't worth maintaining, instead port the few things
using it over to SettingsPreferenceActivity with wrapping blank
Activities like the rest of Settings.

Change-Id: Ic82f0dcb63ed9b4078f7da6a79c0c52f0130e8d1
Fixes: 28779941
/packages/apps/Settings/src/com/android/settings/deviceinfo/Status.java
9d1bfd1e8de6e46137a9571507c03526880d6a46 27-Jan-2016 Chris Wren <cwren@android.com> port settings over to new metrics enum

Change-Id: I0b3efd2f4db773ccbc52bfe59ee8eb0dab9584fb
/packages/apps/Settings/src/com/android/settings/deviceinfo/Status.java
30e0a4a48aada7e0a9bce7dcbf65d31c039dfe51 20-Oct-2015 Jason Monk <jmonk@google.com> resolve merge conflicts of 8e18934478 to master.

Change-Id: I07300436383f8f67cb1d85e6f06f2b2ca3a27534
417a0500c3d7e14013751dbe62791487b033ee72 20-Oct-2015 Jason Monk <jmonk@google.com> Hide SIM and IMEI for wifi only devices

Bug: 24342670
Change-Id: Icfb7db0c1b5c6688c16248daa5e6c0443ff45392
/packages/apps/Settings/src/com/android/settings/deviceinfo/Status.java
39b467482d1bf256a111c757e9b7621c6f523271 10-Sep-2015 Jason Monk <jmonk@google.com> Depend on support lib preferences

Bug: 24576551
Change-Id: Ic6190bacd3f7582c9bbc8de972da4612bd92421e
/packages/apps/Settings/src/com/android/settings/deviceinfo/Status.java
44879a387a6be6b93cdcc8894227d68af7dbbb1a 22-Jul-2015 Xiaohui Chen <xiaohuic@google.com> sys user split: first pass updating Settings

Update various places in Settings to use "admin" ueser flag
instead of checking user id "0". This should be no-op in
single user mode since the only admin user would be user 0.
In split system user mode, this will correctly ACL admin
user instead of non-interactive system user.

Bug: 19913735
Change-Id: Ida4d59c5f689ea0dc34b3b3ff0822b087fa0afd6
/packages/apps/Settings/src/com/android/settings/deviceinfo/Status.java
a71f1dc2ca69e19b637175882e932496f2b32623 20-Apr-2015 Erik Kline <ek@google.com> Use CONNECTIVITY_ACTION instead _IMMEDIATE

With the demise of the connectivity change delay
CONNECTIVITY_ACTION and CONNECTIVITY_ACTION_IMMEDIATE are
issued back to back.

CONNECTIVITY_ACTION_IMMEDIATE is being reaped.

Bug: 20013379
Change-Id: I71d1752cf3b2ebc377127c5fb7bf0864da9a860a
/packages/apps/Settings/src/com/android/settings/deviceinfo/Status.java
8a963babe2e36b7a41f77b8d2598c97658196e58 20-Mar-2015 Chris Wren <cwren@android.com> log visibility of views

Depends-On: I5b1dccb5d103ece3112acf38889bae16273b092f
Change-Id: I116aed2bb805f723a5bf2ec9eb94257de0b4a7b5
/packages/apps/Settings/src/com/android/settings/deviceinfo/Status.java
9a23adf69dc53126c9858b19760eab5b67c23b97 18-Mar-2015 John Spurlock <jspurlock@google.com> Settings: Remove all unused imports.

Change-Id: Iebfa52cb849d69974c94902b0b020893cf5618a3
/packages/apps/Settings/src/com/android/settings/deviceinfo/Status.java
ab84518009c53e28e021f27696cd4e51360fccbc 30-Jan-2015 Sanket Padawe <sanketpadawe@google.com> Remove sim status and imei for secondary user.

Bug: 19165700
Change-Id: I4cc4b09a66acb3c88ac33e6479b165b6872404c8
/packages/apps/Settings/src/com/android/settings/deviceinfo/Status.java
50e6ecacf99c30bf239e68bd54895e3632315063 03-Oct-2014 PauloftheWest <paulofthewest@google.com> [DS] DSDS support for Settings

+ Rebase and modify as APIs rename.
+ Fix bugs on set sub's name as title.
+ Enabled Sim Settings.

Change-Id: Ic731c7882be95b86b6b8dcdd3f208a6125681f3e
/packages/apps/Settings/src/com/android/settings/deviceinfo/Status.java
48383e1604cc52559aafc7341faa962b3accce8e 03-Jul-2014 Derek Tan <derektan@google.com> Get phone number from TelephonyManager on Phone Status page.

Bug: 11900806
Change-Id: I4df3fac7b483ddae2bbda14b5a85629486e400cf
/packages/apps/Settings/src/com/android/settings/deviceinfo/Status.java
3065f75e164d71c9c45b26666e37f5acb68ab3f1 07-Feb-2014 Fabrice Di Meglio <fdimeglio@google.com> Fix bug #12919330 RTE in Settings: PhoneFactory probably already running

- revert changes from the CL for Drawer implementation.
- we cannot convert those Activities to fragments as they are running in the Phone process

Change-Id: I7e4033bc9b53daa7e7aa6f1fd74576375cde88e9
/packages/apps/Settings/src/com/android/settings/deviceinfo/Status.java
263bcc8b732dbb47d3ce63904e0e05191fabbad6 18-Jan-2014 Fabrice Di Meglio <fdimeglio@google.com> Use Drawer in Settings app

- get rid of PreferenceActivity as much as we can and use fragments instead
- add Drawer widget
- add Dashboard high level entry into the Drawer (but this is work in progress and would be done in another CL)
- add bypass of fragment's Header validation when launched from the Drawer but *force* validation if external
call thru an Intent

Be aware that WifiPickerActivity should remain for now a PreferenceActivity. It is used by SetupWizard and should
not trigger running the SettingsActivity's header building code. SetupWizard is a Home during the provisionnig process
and then deactivate itself as a Home but would make the Home header to appear in the Drawer (because momentarily we
would have two Home).

Also, verified that:

- the WiFi settings still work when called from SetupWizard
- when you have multiple Launchers, the Home header will appear in the list of Headers in the Drawer

Change-Id: I407a5e0fdd843ad7615d3d511c416a44e3d97c90
/packages/apps/Settings/src/com/android/settings/deviceinfo/Status.java
deb8f08ace7e255939d793c8a5a0006d424734bc 06-Sep-2013 Lorenzo Colitti <lorenzo@google.com> Dynamically update connectivity and IP address.

The settings status page dynamically updates mobile network
status (in/out of service, signal strength, network type, etc.)
but not IP address and connectivity information. Dynamically
update that information as well, for consistency.

For consistency, also update the advanced wifi settings page.

Bug: 10232006
Change-Id: I3a292d8bd9e36ab16c37e107eefff4b37d884a4c
/packages/apps/Settings/src/com/android/settings/deviceinfo/Status.java
6eb6a908217e080aea43406028be491d269bdbb0 07-Nov-2013 Lorenzo Colitti <lorenzo@google.com> Cache preferences and services in status dialog.

Currently, the status dialog fetches the preferences and system
services that it uses to display connectivity information (e.g.,
IP and MAC addresses) only when the dialog is first opened. This
is fine because the connectivity information is only filled in
once and never updated.

In order to have this information update dynamically (like the
rest of the dialog), fetch and cache these objects in onCreate.
The next change will actually make this information update on
network changes.

Bug: 10232006
Change-Id: Ib4072674543e517cf6935e3e03f35090e728090a
/packages/apps/Settings/src/com/android/settings/deviceinfo/Status.java
b7715323308674cfd0902615124192442159449e 02-Oct-2013 Daniel Sandler <dsandler@android.com> Longpress any row in Status to copy text to the clipboard.

Really convenient for grabbing IMEI/MAC/serial/etc.

Change-Id: I30dd6109d76f342108b10571cf043158b09743d0
/packages/apps/Settings/src/com/android/settings/deviceinfo/Status.java
4e0391a733a3c5ba0c23c00c165aeb580426cee1 07-Dec-2012 Wink Saville <wink@google.com> am 49c4de7f: Merge "Format change at "Mobile network type" value"

* commit '49c4de7f139a1a3a60dc8f7e72acae710dba506f':
Format change at "Mobile network type" value
1fd3544c55eb707f894888da9aaf307a867db806 18-Oct-2012 Akira Oshimi <akira.x.oshimi@sonymobile.com> Format change at "Mobile network type" value

Remove "network type Number" from "mobile network type" value
at "About Phone > Status".

For example value "UNKNOWN:0" became "UNKNOWN"
(if value is "UNKNOWN", the word is localized)

The number ":0" did not add much value to the user.

Change-Id: Iee29fa2ab42f2d6eab5d9dbd6f647087ee382648
/packages/apps/Settings/src/com/android/settings/deviceinfo/Status.java
bc5d9271a9d36ecf07ac35e1635f36679074de6f 04-Dec-2012 Jake Hamby <jhamby@google.com> Add latest area info broadcast to Settings status screen.

When the SIM has a Brazilian country code, add an item to the
status screen to show the most recently received area info cell
broadcast, requested from CellBroadcastReceiver, which also
broadcasts any updates to the area info. To read the area info
broadcast or request it from CellBroadcastReceiver requires
READ_PHONE_STATE permission.

Bug: 7445881
Change-Id: I387e23ecd0802b212ecb3e44f900a3a7a4b27e76
/packages/apps/Settings/src/com/android/settings/deviceinfo/Status.java
9627a8ea151c1f27e5e9f34592c7b34fea3101c3 23-Sep-2012 Amith Yamasani <yamasani@google.com> Show more settings and add restrictions/dialogs for secondary users

Bug: 7213029 crash in About>Status
Bug: 7212495 hide System updates for second user
Bug: 7212230 nickname editor should select the text
Bug: 7160487 TTS settings
Bug: 7129411 Settings needs visibility changes for secondary users

Change-Id: Ia2d1229c08b392edfa6b671fce4a382410405b14
/packages/apps/Settings/src/com/android/settings/deviceinfo/Status.java
5543404ae0ec9635b59d37fa01074ea598d539eb 14-Jun-2012 Wink Saville <wink@google.com> Use telephony-common

Change-Id: Ic95136fd5934afdd53a08bfd640d40add67fdb44
/packages/apps/Settings/src/com/android/settings/deviceinfo/Status.java
404e3a75922668b3d7709f5a5e23d611101c88d1 03-May-2012 Amith Yamasani <yamasani@google.com> am b3c17c57: Merge "Removing static reference from sUnknown"

* commit 'b3c17c570a6c26ece11b404a5918ce4bd64a0940':
Removing static reference from sUnknown
e37f427cbb9b382fbdf64420d2592be19e627544 18-Feb-2012 Robert Greenwalt <rgreenwalt@google.com> Use the framework rather than RIL constants

bug:5717664
Change-Id: I07f8fe3a874aff775e4be8513cd020bf9d090b6a
/packages/apps/Settings/src/com/android/settings/deviceinfo/Status.java
41e70e67fa218858a38a4105b3fbadcd4f82c846 25-Jan-2012 Gustavo Waku <gustavo.waku@gmail.com> Removing static reference from sUnknown

Removing static reference from field sUnknown
allows framework to handle properly resources.
Current implementation holds an instance of
sUnknown, final user sees "Unknown" field on the
IMEI SV [ Menu > About > Status ] even if the
language set is other than english.

Change-Id: I6345f578577e631782c0598bfa44ff4de04c6261
/packages/apps/Settings/src/com/android/settings/deviceinfo/Status.java
7c5c16565eccde0b98f7ad08a0f06ff51e8e90ce 13-Oct-2011 tk.mun <tk.mun@samsung.com> Wimax : 4G settings menu and 4G MAC address.

1. Show the 4G menu.
2. Show the 4G MAC address
3. Execute 4G setting apk.

Change-Id: I14adc4775d35afe3398ddba4fd91c739011a06fa
Signed-off-by: tk.mun <tk.mun@samsung.com>
bug:5486930
/packages/apps/Settings/src/com/android/settings/deviceinfo/Status.java
6822b749bbd525abcf492e4f5a236d77a910331a 18-Oct-2011 Amith Yamasani <yamasani@google.com> Show IP address of current active link instead of just the WiFi IP address.

Bug: 5359194

Show "Unavailable" only if there's no active link.

Change-Id: I82ba6bda3a08ea84080a8d8cda331f22d7c7a2bd
/packages/apps/Settings/src/com/android/settings/deviceinfo/Status.java
8af88fb8387259e51615709b2d1ea0260f7057fd 31-Aug-2011 Robert Greenwalt <rgreenwalt@google.com> Use the new isNetworkSupported api for wifi-only

Didn't have an API for this before so people used a hacked system property (ro.carrier)
to determine if the device supported mobile data. Added new API and switching callsites.

bug:5087537
Change-Id: Ibd799559be102a9e2fd552d1a23d1afbcf8f4614
/packages/apps/Settings/src/com/android/settings/deviceinfo/Status.java
a4379d6b38e568fcb60831d6f2fa349ba20f9b82 22-Jul-2011 Amith Yamasani <yamasani@google.com> Use a different wallpaper fragment title from the preference item.

Change wallpaper list ordering to alphabetic.
Display battery level and charging status in Battery settings.

Change-Id: I8ead0fb0f018c79ed258bd1c1ca3f8ecaf32da83
/packages/apps/Settings/src/com/android/settings/deviceinfo/Status.java
25bd33e1cfb753ff0a118e6c84f6e23163713b69 13-Jul-2011 John Wang <johnwang@google.com> am d7b2dccb: Display IMEI and ICCID for LTE device.

* commit 'd7b2dccbe60a02965186d28f0b671ef1c419a2a8':
Display IMEI and ICCID for LTE device.
d7b2dccbe60a02965186d28f0b671ef1c419a2a8 12-Jul-2011 John Wang <johnwang@google.com> Display IMEI and ICCID for LTE device.

Display IMEI nad ICCID in About tablet / Status for LTE devices.

bug:4983512
bug:5001888
Change-Id: I4c418b159b49bef96acd5ef300c9b71379821d1b
/packages/apps/Settings/src/com/android/settings/deviceinfo/Status.java
079e30cd2a09388ba9ad2149a66de86be4f3a7ac 07-Jun-2011 Marco Nelissen <marcone@google.com> resolved conflicts for merge of 531bed61 to honeycomb-plus-aosp

Change-Id: I28154c6feb563712eeda3e1176d62c7d2a28eff8
95364e4af3cb09bff58baab6fa4a6a2218e7fc94 24-May-2011 sy310.choi <sy310.choi@samsung.com> Allow alternate string to be used for min_number

"MSID" can be shown instead of "MIN" if config_msid_enable
is set to true.

Change-Id: I6d072a5db9a5b46b17a57257221e109ba9a86698
/packages/apps/Settings/src/com/android/settings/deviceinfo/Status.java
36469186b7459d13688a2ca1c2316dbf172794dd 23-Feb-2011 TK MUN <tk.mun@samsung.com> DO NOT MERGE WiMAX settings menu

1. Show the 4G menu.
2. Show the 4G MAC address
3. Execute 4G setting apk.

Change-Id: Id9d5551e5bfdb7d79279de42b36ec0ebccdf6099
Signed-off-by: TK MUN <tk.mun@samsung.com>
/packages/apps/Settings/src/com/android/settings/deviceinfo/Status.java
0c62c6449bf2c0954653b996a3bfb269a64c6562 02-Mar-2011 Amith Yamasani <yamasani@google.com> am 38d3353e: am 03e90322: Merge "Remove more entries not relevant to wifi-only devices." into honeycomb

* commit '38d3353e37be450b1b95d2525acbd53e9b67130e':
Remove more entries not relevant to wifi-only devices.
c06d4c48a9455d6018f2d793c6b8f211f1131055 25-Feb-2011 Amith Yamasani <yamasani@google.com> Remove more entries not relevant to wifi-only devices.

Bug: 3488384
Bug: 3487976
Bug: 3488381

Removed Cell standby entry from Battery use screen.
Removed Mobile signal strength from BatteryHistory screen.
Added wifi IP address to About->Status
Remove auto-timezone checkbox in Settings->Date & time

Change-Id: I228721a3613b1aeb600026e42274337886552698
/packages/apps/Settings/src/com/android/settings/deviceinfo/Status.java
e18897bc2242110782fca135e9e47fcdb5839d64 26-Feb-2011 Doug Zongker <dougz@android.com> am 26c433c1: am 489c7bff: show Build.SERIAL in settings > about > status

* commit '26c433c1c64416aed4736bb5a76b0ac4585958a1':
show Build.SERIAL in settings > about > status
489c7bff5c54c35e7156a99337d538e08f3aab7f 25-Feb-2011 Doug Zongker <dougz@android.com> show Build.SERIAL in settings > about > status

For wifi-only devices, this may be the only way we have to identify
the device.

Change-Id: I70c09e4cdb101282e5d085bcab3f57c890bc7a98
Bug: 3490911
/packages/apps/Settings/src/com/android/settings/deviceinfo/Status.java
882c74a6799d24c766e3db81a316743bbe11e0be 17-Feb-2011 Wink Saville <wink@google.com> Changes for ril.h version 6.

Change-Id: I7e269e5a971c70d6d9a1731b82c538b722cbc01d
/packages/apps/Settings/src/com/android/settings/deviceinfo/Status.java
b409b904d603f53bad0700555569875e61fc5231 24-Jan-2011 Amith Yamasani <yamasani@google.com> Bring back the MDN (phone number) status even if there's no voice.

Needed for carrier customer support purposes.

Bug: 3351493

Change "My phone number" string to "MDN".

Change-Id: Icee0f97348034a9fb7f79a3c48868d5f74edabb1
/packages/apps/Settings/src/com/android/settings/deviceinfo/Status.java
ffe813c380d7609fb94c65337b0964952f19c130 09-Jan-2011 Amith Yamasani <yamasani@google.com> Remove phone number status conditionally for devices without voice.

Bug: 3041861

Change-Id: I36fb6c584c24b995da0ac4e3b41d860f3a6f5396
/packages/apps/Settings/src/com/android/settings/deviceinfo/Status.java
f42d5e7e2ee7dde31e64270246c2e3b8d573d61b 18-Mar-2010 David Brown <dab@google.com> 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
/packages/apps/Settings/src/com/android/settings/deviceinfo/Status.java
f25b3e04dbde05b025a0aaf6b1f555b8e16241b1 15-Mar-2010 Jeff Hamilton <jham@android.com> Format the phone number when displaying in the status settings panel.

Change-Id: I12e437696ebfa6ca8dcdc373f1387fd98e451e50
/packages/apps/Settings/src/com/android/settings/deviceinfo/Status.java
d1a04291c537e271999c7e7c5c72f1f61632aacf 08-Oct-2009 Nick Pelly <npelly@google.com> 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.
/packages/apps/Settings/src/com/android/settings/deviceinfo/Status.java
d63c0112251ab4e4e977545368dd703d875012a4 15-Aug-2009 Nick Pelly <npelly@google.com> 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).
/packages/apps/Settings/src/com/android/settings/deviceinfo/Status.java
4c470091723e84dc894154a030f02b5153d286e5 31-Jul-2009 John Wang <johnwang@google.com> am ed47f1e4: Fix the NullPointerException in Status Info.

Merge commit 'ed47f1e497abf5ad31b1c7035ae04478e9932986'

* commit 'ed47f1e497abf5ad31b1c7035ae04478e9932986':
Fix the NullPointerException in Status Info.
ed47f1e497abf5ad31b1c7035ae04478e9932986 31-Jul-2009 John Wang <johnwang@google.com> 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
/packages/apps/Settings/src/com/android/settings/deviceinfo/Status.java
620965ccc58a7623d564300eeee97ab5d77e1480 26-Jun-2009 Chouting Zhang <MichaelZhang@motorola.com> am 386278a3: CDMA Settings additions

Merge commit '386278a338d740dce95b7fa1514662b0eb5683e4'

* commit '386278a338d740dce95b7fa1514662b0eb5683e4':
CDMA Settings additions
386278a338d740dce95b7fa1514662b0eb5683e4 24-Jun-2009 Chouting Zhang <MichaelZhang@motorola.com> 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
/packages/apps/Settings/src/com/android/settings/deviceinfo/Status.java
402a740f64b96ca2f906a79ba02c226d955e20dd 01-Jun-2009 Wink Saville <wink@google.com> am e2a14e35: Update some TODO comments.

Merge commit 'e2a14e35aa525de6cbc0179c67ec971295f2db03'

* commit 'e2a14e35aa525de6cbc0179c67ec971295f2db03':
Update some TODO comments.
e2a14e35aa525de6cbc0179c67ec971295f2db03 29-May-2009 Wink Saville <wink@google.com> Update some TODO comments.
/packages/apps/Settings/src/com/android/settings/deviceinfo/Status.java
76dce5843599606fab312323801398d11fdd49e5 19-May-2009 Android (Google) Code Review <android-gerrit@google.com> am 81807831: Merge change 1582 into donut

Merge commit '818078310759e3fbd227c578e20a54e935b1b92a'

* commit '818078310759e3fbd227c578e20a54e935b1b92a':
Teleca 2b changes.
ead6928894c5f63ba8751962d93987b412b4b209 13-May-2009 Wink Saville <wink@google.com> Teleca 2b changes.
/packages/apps/Settings/src/com/android/settings/deviceinfo/Status.java
8762093e0094e09493fa6cbac8e8fbf265f18165 15-May-2009 Michael Chan <mchan@android.com> 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
/packages/apps/Settings/src/com/android/settings/deviceinfo/Status.java
c38866843e966622346dc8f7b028749cac9c2198 02-Apr-2009 Wink Saville <> AI 144245: Fix merge conflict for megering in the CDMA changes in to master from donutburger.

Automated import of CL 144245
/packages/apps/Settings/src/com/android/settings/deviceinfo/Status.java
f9e024198d3b16454287888bd5d40fee23390d23 02-Apr-2009 Wink Saville <> AI 144185: Integrate cdma into the main code base.

Automated import of CL 144185
/packages/apps/Settings/src/com/android/settings/deviceinfo/Status.java
5990cc129c1dfa52bf51bca49f214e3ea9078128 25-Mar-2009 Evan Millar <> Automated import from //branches/master/...@142436,142436
/packages/apps/Settings/src/com/android/settings/deviceinfo/Status.java
83368552d1f82cf7cc36f01dc3697e9607a43123 25-Mar-2009 Evan Millar <> Automated import from //branches/donutburger/...@142431,142431
/packages/apps/Settings/src/com/android/settings/deviceinfo/Status.java
d166402fc3421dcb58aa45ecf08e29b590b7d4a7 25-Mar-2009 Mike Ritter <> Automated import from //branches/donutburger/...@141180,141180
/packages/apps/Settings/src/com/android/settings/deviceinfo/Status.java
18f3afb9cdfc617e778e2807ee58da50f251790e 25-Mar-2009 Mike Ritter <> Automated import from //branches/master/...@141186,141186
/packages/apps/Settings/src/com/android/settings/deviceinfo/Status.java
72ed6feab24308a0acd1fa2135afa3476759cf39 13-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake_rel/...@138607
/packages/apps/Settings/src/com/android/settings/deviceinfo/Status.java
afc4ab2ffbb8327ddce9907961295a32cbf49d0f 04-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@135843
/packages/apps/Settings/src/com/android/settings/deviceinfo/Status.java
4e14e5ccbf1ef27220419849133d482a546d5c04 04-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@135843
/packages/apps/Settings/src/com/android/settings/deviceinfo/Status.java
477296898777d0bdf41fc49c047a6b9374f27fe1 19-Feb-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@132276
/packages/apps/Settings/src/com/android/settings/deviceinfo/Status.java
1feaa85791b3b5cc66a16142afc2259a2356bc9e 11-Feb-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@130745
/packages/apps/Settings/src/com/android/settings/deviceinfo/Status.java
abc48f80d8747b4fc051b7dd364355ee667a9bac 18-Dec-2008 The Android Open Source Project <initial-contribution@android.com> Code drop from //branches/cupcake/...@124589
/packages/apps/Settings/src/com/android/settings/deviceinfo/Status.java
de2d9f5f109265873196f1615e1f3546b114aaa7 21-Oct-2008 The Android Open Source Project <initial-contribution@android.com> Initial Contribution
/packages/apps/Settings/src/com/android/settings/deviceinfo/Status.java