summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2012-02-27 17:09:37 -0800
committerAmith Yamasani <yamasani@google.com>2012-02-27 17:18:45 -0800
commit5fb53f36cb77c3d924b3fe5c305ce7d082ecdfb8 (patch)
tree9c1100574bca997e3bad51817a7aaff35cdd52af /src/com
parentfffd9f0b116cf4e2dfbb0308fe3f10b5bcbb7d8d (diff)
downloadpackages_apps_Settings-5fb53f36cb77c3d924b3fe5c305ce7d082ecdfb8.zip
packages_apps_Settings-5fb53f36cb77c3d924b3fe5c305ce7d082ecdfb8.tar.gz
packages_apps_Settings-5fb53f36cb77c3d924b3fe5c305ce7d082ecdfb8.tar.bz2
Don't crash if there's no bluetooth functionality (such as in an emulator)
Bug: 6079494 Change-Id: I12f729134407eaa719dc6a25e89a3b48476985e2
Diffstat (limited to 'src/com')
-rwxr-xr-xsrc/com/android/settings/bluetooth/BluetoothSettings.java14
-rw-r--r--src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java3
2 files changed, 13 insertions, 4 deletions
diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java
index 6899bc3..7c8cb6e 100755
--- a/src/com/android/settings/bluetooth/BluetoothSettings.java
+++ b/src/com/android/settings/bluetooth/BluetoothSettings.java
@@ -138,21 +138,26 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment {
public void onResume() {
// resume BluetoothEnabler before calling super.onResume() so we don't get
// any onDeviceAdded() callbacks before setting up view in updateContent()
- mBluetoothEnabler.resume();
+ if (mBluetoothEnabler != null) {
+ mBluetoothEnabler.resume();
+ }
super.onResume();
if (mDiscoverableEnabler != null) {
mDiscoverableEnabler.resume();
}
getActivity().registerReceiver(mReceiver, mIntentFilter);
-
- updateContent(mLocalAdapter.getBluetoothState(), mActivityStarted);
+ if (mLocalAdapter != null) {
+ updateContent(mLocalAdapter.getBluetoothState(), mActivityStarted);
+ }
}
@Override
public void onPause() {
super.onPause();
- mBluetoothEnabler.pause();
+ if (mBluetoothEnabler != null) {
+ mBluetoothEnabler.pause();
+ }
getActivity().unregisterReceiver(mReceiver);
if (mDiscoverableEnabler != null) {
mDiscoverableEnabler.pause();
@@ -161,6 +166,7 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment {
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+ if (mLocalAdapter == null) return;
boolean bluetoothIsEnabled = mLocalAdapter.getBluetoothState() == BluetoothAdapter.STATE_ON;
boolean isDiscovering = mLocalAdapter.isDiscovering();
int textId = isDiscovering ? R.string.bluetooth_searching_for_devices :
diff --git a/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java b/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
index 061f2c9..90f8de5 100644
--- a/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
+++ b/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
@@ -96,6 +96,7 @@ public abstract class DeviceListPreferenceFragment extends
@Override
public void onResume() {
super.onResume();
+ if (mLocalManager == null) return;
mLocalManager.setForegroundActivity(getActivity());
mLocalManager.getEventManager().registerCallback(this);
@@ -106,6 +107,8 @@ public abstract class DeviceListPreferenceFragment extends
@Override
public void onPause() {
super.onPause();
+ if (mLocalManager == null) return;
+
removeAllDevices();
mLocalManager.setForegroundActivity(null);
mLocalManager.getEventManager().unregisterCallback(this);