Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 1b09c97d: am 4447405d: Merge "Callback on correct method when status is unsuccessful." into klp-modular-dev

Browse Source 
* commit '1b09c97d8a7156a9f35ebab3c98db7b103852a58':
  Callback on correct method when status is unsuccessful.
This commit is contained in:
Wei Wang
2014-03-29 02:03:03 +00:00
committed by Android Git Automerger
parent c75db8266b 1b09c97d8a
commit ab4fc115e9
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/android/bluetooth/BluetoothAdapter.java
View File

@@ -1986,7 +1986,13 @@ public final class BluetoothAdapter {
public void onAdvertiseStateChange(int advertiseState, int status) { public void onAdvertiseStateChange(int advertiseState, int status) {
Log.d(TAG, "on advertise call back, state: " + advertiseState + " status: " + status); Log.d(TAG, "on advertise call back, state: " + advertiseState + " status: " + status);
if (advertiseState == STATE_ADVERTISE_STARTED) { if (advertiseState == STATE_ADVERTISE_STARTED) {
mAdvertiseCallback.onAdvertiseStart(status); if (status == ADVERTISE_CALLBACK_SUCCESS) {
mAdvertiseCallback.onAdvertiseStart(status);
} else {
// If status is unsuccessful and advertise state is started, it means stop
// advertising fails.
mAdvertiseCallback.onAdvertiseStop(status);
}
} else { } else {
synchronized (this) { synchronized (this) {
if (status == ADVERTISE_CALLBACK_SUCCESS) { if (status == ADVERTISE_CALLBACK_SUCCESS) {
@@ -2008,7 +2014,13 @@ public final class BluetoothAdapter {
} }
} }
} }
mAdvertiseCallback.onAdvertiseStop(status); if (status == ADVERTISE_CALLBACK_SUCCESS) {
mAdvertiseCallback.onAdvertiseStop(status);
} else{
// If status is unsuccesful and advertise state is stopped, it means start
// advertising fails.
mAdvertiseCallback.onAdvertiseStart(status);
}
} }
} }
} }