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

Merge "Bluetooth: report proper advertiser status on error" am: b509957e62 am: 673c0e5596

Browse Source 
am: e8ceb15b51

Change-Id: I21eb000be58fd61b238e2401cf266b6f132acc83
This commit is contained in:
Jakub Pawlowski
2016-11-23 02:08:12 +00:00
committed by android-build-merger
parent 4c428778c3 e8ceb15b51
commit 0debe3c5b7
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/bluetooth/le/BluetoothLeAdvertiser.java
View File

@@ -235,6 +235,7 @@ public final class BluetoothLeAdvertiser {
// >=0: registered and advertising started // >=0: registered and advertising started
private int mAdvertiserId; private int mAdvertiserId;
private boolean mIsAdvertising = false; private boolean mIsAdvertising = false;
private int registrationError = AdvertiseCallback.ADVERTISE_FAILED_INTERNAL_ERROR;
public AdvertiseCallbackWrapper(AdvertiseCallback advertiseCallback, public AdvertiseCallbackWrapper(AdvertiseCallback advertiseCallback,
AdvertiseData advertiseData, AdvertiseData scanResponse, AdvertiseData advertiseData, AdvertiseData scanResponse,
@@ -262,12 +263,11 @@ public final class BluetoothLeAdvertiser {
mLeAdvertisers.put(mAdvertiseCallback, this); mLeAdvertisers.put(mAdvertiseCallback, this);
} else if (mAdvertiserId < 0) { } else if (mAdvertiserId < 0) {
// Registration timeout, reset mClientIf to -1 so no subsequent operations can // Registration timeout, reset mClientIf to -2 so no subsequent operations can
// proceed. // proceed.
if (mAdvertiserId == 0) mAdvertiserId = -2; if (mAdvertiserId == -1) mAdvertiserId = -2;
// Post internal error if registration failed. // Post internal error if registration failed.
postStartFailure(mAdvertiseCallback, postStartFailure(mAdvertiseCallback, registrationError);
AdvertiseCallback.ADVERTISE_FAILED_INTERNAL_ERROR);
} else { } else {
// Unregister application if it's already registered but advertise failed. // Unregister application if it's already registered but advertise failed.
try { try {
@@ -318,6 +318,8 @@ public final class BluetoothLeAdvertiser {
} catch (RemoteException e) { } catch (RemoteException e) {
Log.e(TAG, "failed to start advertising", e); Log.e(TAG, "failed to start advertising", e);
} }
} else if (status == AdvertiseCallback.ADVERTISE_FAILED_TOO_MANY_ADVERTISERS) {
registrationError = status;
} }
// Registration failed. // Registration failed.
mAdvertiserId = -2; mAdvertiserId = -2;