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

Merge "Callback on correct method when status is unsuccessful." into klp-modular-dev

Browse Source
This commit is contained in:
Wei Wang
2014-03-29 01:53:33 +00:00
committed by Android (Google) Code Review
parent e9eb58c9a0 c07a5dd709
commit 4447405d76
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

@@ -1989,7 +1989,13 @@ public final class BluetoothAdapter {
public void onAdvertiseStateChange(int advertiseState, int status) {
Log.d(TAG, "on advertise call back, state: " + advertiseState + " status: " + status);
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 {
synchronized (this) {
if (status == ADVERTISE_CALLBACK_SUCCESS) {
@@ -2011,7 +2017,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);
}
}
}
}