PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Settings into eclair-mr2-plus-aosp

Browse Source
This commit is contained in:
Nick Pelly
2009-10-07 16:41:31 -07:00
committed by Android Git Automerger
parent c4cd095d7b 99479dd32f
commit c74237633f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/bluetooth/LocalBluetoothManager.java
View File

@@ -92,7 +92,7 @@ public class LocalBluetoothManager {
// This will be around as long as this process is // This will be around as long as this process is
mContext = context.getApplicationContext(); mContext = context.getApplicationContext();
mAdapter = (BluetoothAdapter) context.getSystemService(Context.BLUETOOTH_SERVICE); mAdapter = BluetoothAdapter.getDefaultAdapter();
if (mAdapter == null) { if (mAdapter == null) {
return false; return false;
} }

2
src/com/android/settings/deviceinfo/Status.java
View File

@@ -377,7 +377,7 @@ public class Status extends PreferenceActivity {
} }
private void setBtStatus() { private void setBtStatus() {
BluetoothAdapter bluetooth = (BluetoothAdapter) getSystemService(BLUETOOTH_SERVICE); BluetoothAdapter bluetooth = BluetoothAdapter.getDefaultAdapter();
Preference btAddressPref = findPreference(KEY_BT_ADDRESS); Preference btAddressPref = findPreference(KEY_BT_ADDRESS);
if (bluetooth == null) { if (bluetooth == null) {