am ab4fc115: am 1b09c97d: am 4447405d: Merge "Callback on correct method when... (58aee2ac) · Commits · e / os / android_frameworks_base

core/java/android/bluetooth/BluetoothAdapter.java

+14 −2

Original line number	Diff line number	Diff line
		@@ -1986,7 +1986,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) {
		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) {
		@@ -2008,7 +2014,13 @@ public final class BluetoothAdapter {
		}
		}
		}
		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);
		}
		}
		}
		}