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

Merge "Turning Bluetooth on will make the device discoverable." into lmp-dev

Browse Source
This commit is contained in:
PauloftheWest
2014-09-08 21:00:11 +00:00
committed by Android (Google) Code Review
parent 01f3a15e89 469c812878
commit 5fe30ea841
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -83,6 +83,7 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment implem
private boolean mAvailableDevicesCategoryIsPresent;
private boolean mInitialScanStarted;
private boolean mInitiateDiscoverable;
private TextView mEmptyView;
private SwitchBar mSwitchBar;
@@ -119,6 +120,7 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment implem
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
mInitialScanStarted = (savedInstanceState != null); // don't auto start scan after rotation
mInitiateDiscoverable = true;
mEmptyView = (TextView) getView().findViewById(android.R.id.empty);
getListView().setEmptyView(mEmptyView);
@@ -153,8 +155,7 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment implem
}
super.onResume();
// Make the device visible to other devices.
mLocalAdapter.setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE);
mInitiateDiscoverable = true;
if (isUiRestricted()) {
setDeviceListGroup(getPreferenceScreen());
@@ -325,6 +326,14 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment implem
preferenceScreen.addPreference(mMyDevicePreference);
getActivity().invalidateOptionsMenu();
// mLocalAdapter.setScanMode is internally synchronized so it is okay for multiple
// threads to execute.
if (mInitiateDiscoverable) {
// Make the device visible to other devices.
mLocalAdapter.setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE);
mInitiateDiscoverable = false;
}
return; // not break
case BluetoothAdapter.STATE_TURNING_OFF: