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

am c0384b6b: DO NOT MERGE: Move advetise clean up to callback code. fixes b/13289050 Cherrypick from master to fix b/13289050

Browse Source 
* commit 'c0384b6b18617cc395814c5b20077955a185e392':
  DO NOT MERGE: Move advetise clean up to callback code. fixes b/13289050 Cherrypick from master to fix b/13289050
This commit is contained in:
Wei Wang
2014-03-20 03:41:47 +00:00
committed by Android Git Automerger
parent 15a18d07ac c0384b6b18
commit 13bd85772f
1 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -593,7 +593,6 @@ public final class BluetoothAdapter {
return false; return false;
} }
mAdvertisingGattCallback.stopAdvertising(); mAdvertisingGattCallback.stopAdvertising();
mAdvertisingGattCallback = null;
return true; return true;
} catch (RemoteException e) { } catch (RemoteException e) {
Log.e(TAG, "", e); Log.e(TAG, "", e);
@@ -1797,15 +1796,12 @@ public final class BluetoothAdapter {
try { try {
IBluetoothGatt iGatt = adapter.getBluetoothManager().getBluetoothGatt(); IBluetoothGatt iGatt = adapter.getBluetoothManager().getBluetoothGatt();
iGatt.stopAdvertising(); iGatt.stopAdvertising();
Log.d(TAG, "unregistering client " + mLeHandle);
iGatt.unregisterClient(mLeHandle);
} catch (RemoteException e) { } catch (RemoteException e) {
Log.e(TAG, "Failed to stop advertising and unregister" + e); Log.e(TAG, "Failed to stop advertising" + e);
} }
} else { } else {
Log.e(TAG, "stopAdvertising, BluetoothAdapter is null"); Log.e(TAG, "stopAdvertising, BluetoothAdapter is null");
} }
mLeHandle = -1;
notifyAll(); notifyAll();
} }
} }
@@ -1995,6 +1991,26 @@ public final class BluetoothAdapter {
if (advertiseState == STATE_ADVERTISE_STARTED) { if (advertiseState == STATE_ADVERTISE_STARTED) {
mAdvertiseCallback.onAdvertiseStart(status); mAdvertiseCallback.onAdvertiseStart(status);
} else { } else {
synchronized (this) {
if (status == ADVERTISE_CALLBACK_SUCCESS) {
BluetoothAdapter adapter = mBluetoothAdapter.get();
if (adapter != null) {
try {
IBluetoothGatt iGatt =
adapter.getBluetoothManager().getBluetoothGatt();
Log.d(TAG, "unregistering client " + mLeHandle);
iGatt.unregisterClient(mLeHandle);
// Reset advertise app handle.
mLeHandle = -1;
adapter.mAdvertisingGattCallback = null;
} catch (RemoteException e) {
Log.e(TAG, "Failed to unregister client" + e);
}
} else {
Log.e(TAG, "cannot unregister client, BluetoothAdapter is null");
}
}
}
mAdvertiseCallback.onAdvertiseStop(status); mAdvertiseCallback.onAdvertiseStop(status);
} }
} }