am 5117cf4c: Fix OPP crash and Call Log sort order. (fbdbd714) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/opp/BluetoothOppObexServerSession.java

+13 −8

Original line number	Diff line number	Diff line
		@@ -286,14 +286,14 @@ public class BluetoothOppObexServerSession extends ServerRequestHandler implemen
		if (V) Log.v(TAG, "mLocalShareInfoId = " + mLocalShareInfoId);

		if (V) Log.v(TAG, "acquire partial WakeLock");


		synchronized (this) {
		if (mWakeLock.isHeld()) {
		mPartialWakeLock.acquire();
		mWakeLock.release();
		}

		mServerBlocking = true;

		synchronized (this) {
		try {

		while (mServerBlocking) {
		@@ -538,15 +538,20 @@ public class BluetoothOppObexServerSession extends ServerRequestHandler implemen
		resp.responseCode = ResponseCodes.OBEX_HTTP_OK;
		}

		@Override
		public void onClose() {
		if (V) Log.v(TAG, "release WakeLock");
		private synchronized void releaseWakeLocks() {
		if (mWakeLock.isHeld()) {
		mWakeLock.release();
		}
		if (mPartialWakeLock.isHeld()) {
		mPartialWakeLock.release();
		}
		}

		@Override
		public void onClose() {
		if (V) Log.v(TAG, "release WakeLock");
		releaseWakeLocks();

		/* onClose could happen even before start() where mCallback is set */
		if (mCallback != null) {
		Message msg = Message.obtain(mCallback);

+3 −2

Original line number	Diff line number	Diff line
		@@ -444,7 +444,7 @@ public class BluetoothPbapVcardManager {

		composer = new VCardComposer(mContext, vcardType, true);
		composer.addHandler(new HandlerForStringBuffer(op, ownerVCard));
		if (!composer.init(Contacts.CONTENT_URI, selection, null, null)) {
		if (!composer.init(Contacts.CONTENT_URI, selection, null, Contacts._ID)) {
		return ResponseCodes.OBEX_HTTP_INTERNAL_ERROR;
		}

		@@ -470,7 +470,8 @@ public class BluetoothPbapVcardManager {
		try {
		composer = new BluetoothPbapCallLogComposer(mContext, true);
		composer.addHandler(new HandlerForStringBuffer(op, ownerVCard));
		if (!composer.init(CallLog.Calls.CONTENT_URI, selection, null, null)) {
		if (!composer.init(CallLog.Calls.CONTENT_URI, selection, null,
		CALLLOG_SORT_ORDER)) {
		return ResponseCodes.OBEX_HTTP_INTERNAL_ERROR;
		}