Merge "OPP: Send proper share status of file once transfer is complete" (3649d3f4) · Commits · e / os / android_packages_modules_Bluetooth

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

+7 −12

Original line number	Diff line number	Diff line
		@@ -288,19 +288,14 @@ public class BluetoothOppObexClientSession implements BluetoothOppObexSession {
		Constants.updateShareStatus(mContext1, mInfo.mId, status);
		}

		if (status == BluetoothShare.STATUS_SUCCESS) {
		Message msg = Message.obtain(mCallback);
		msg.what = BluetoothOppObexSession.MSG_SHARE_COMPLETE;
		msg.obj = mInfo;
		msg.sendToTarget();
		} else {
		Message msg = Message.obtain(mCallback);
		msg.what = BluetoothOppObexSession.MSG_SESSION_ERROR;
		msg.what = (status == BluetoothShare.STATUS_SUCCESS) ?
		BluetoothOppObexSession.MSG_SHARE_COMPLETE :
		BluetoothOppObexSession.MSG_SESSION_ERROR;
		mInfo.mStatus = status;
		msg.obj = mInfo;
		msg.sendToTarget();
		}
		}

		/*
		* Validate this ShareInfo

+1 −2

Original line number	Diff line number	Diff line
		@@ -721,8 +721,7 @@ public class BluetoothOppService extends Service {
		.getColumnIndexOrThrow(BluetoothShare.USER_CONFIRMATION));
		int newStatus = cursor.getInt(statusColumn);

		if (!BluetoothShare.isStatusCompleted(info.mStatus)
		&& BluetoothShare.isStatusCompleted(newStatus)) {
		if (BluetoothShare.isStatusCompleted(info.mStatus)) {
		mNotifier.mNotificationMgr.cancel(info.mId);
		}