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

am 93724840: Don\'t crash if there\'s no bluetooth functionality (such as in an emulator) do not merge.

Browse Source 
* commit '9372484065993cfdb9a48ddecc52d2ed911e8ce1':
  Don't crash if there's no bluetooth functionality (such as in an emulator) do not merge.
This commit is contained in:
Amith Yamasani
2012-02-28 10:13:28 -08:00
committed by Android Git Automerger
parent 7b27630217 9372484065
commit e5cb62f5f4
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/bluetooth/BluetoothSettings.java
View File

@@ -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 :

3
src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
View File

@@ -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);