diff options
| author | Amith Yamasani <yamasani@google.com> | 2012-02-27 17:09:37 -0800 |
|---|---|---|
| committer | Amith Yamasani <yamasani@google.com> | 2012-02-27 17:18:45 -0800 |
| commit | 5fb53f36cb77c3d924b3fe5c305ce7d082ecdfb8 (patch) | |
| tree | 9c1100574bca997e3bad51817a7aaff35cdd52af /src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java | |
| parent | fffd9f0b116cf4e2dfbb0308fe3f10b5bcbb7d8d (diff) | |
| download | packages_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/android/settings/bluetooth/DeviceListPreferenceFragment.java')
| -rw-r--r-- | src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java | 3 |
1 files changed, 3 insertions, 0 deletions
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); |