Merge "OPP: Remove markBatchFailed with no arguments" (9c270646) · Commits · e / os / android_packages_apps_Bluetooth

src/com/android/bluetooth/opp/BluetoothOppTransfer.java

+3 −7

Original line number	Original line	Diff line number	Diff line
	@@ -325,7 +325,7 @@ public class BluetoothOppTransfer implements BluetoothOppBatch.BluetoothOppBatch
	if (info3 != null) {		if (info3 != null) {
	markBatchFailed(info3.mStatus);		markBatchFailed(info3.mStatus);
	} else {		} else {
	markBatchFailed();		markBatchFailed(BluetoothShare.STATUS_UNKNOWN_ERROR);
	}		}
	tickShareStatus(mCurrentShare);		tickShareStatus(mCurrentShare);
	}		}
	@@ -441,10 +441,6 @@ public class BluetoothOppTransfer implements BluetoothOppBatch.BluetoothOppBatch

	}		}

	private void markBatchFailed() {
	markBatchFailed(BluetoothShare.STATUS_UNKNOWN_ERROR);
	}

	/*		/*
	* NOTE		* NOTE
	* For outbound transfer		* For outbound transfer
	@@ -474,7 +470,7 @@ public class BluetoothOppTransfer implements BluetoothOppBatch.BluetoothOppBatch
	*/		*/
	if (!mAdapter.isEnabled()) {		if (!mAdapter.isEnabled()) {
	Log.e(TAG, "Can't start transfer when Bluetooth is disabled for " + mBatch.mId);		Log.e(TAG, "Can't start transfer when Bluetooth is disabled for " + mBatch.mId);
	markBatchFailed();		markBatchFailed(BluetoothShare.STATUS_UNKNOWN_ERROR);
	mBatch.mStatus = Constants.BATCH_STATUS_FAILED;		mBatch.mStatus = Constants.BATCH_STATUS_FAILED;
	return;		return;
	}		}
	@@ -570,7 +566,7 @@ public class BluetoothOppTransfer implements BluetoothOppBatch.BluetoothOppBatch
	if (mSession == null) {		if (mSession == null) {
	/** set current share as error */		/** set current share as error */
	Log.e(TAG, "Unexpected error happened !");		Log.e(TAG, "Unexpected error happened !");
	markBatchFailed();		markBatchFailed(BluetoothShare.STATUS_UNKNOWN_ERROR);
	mBatch.mStatus = Constants.BATCH_STATUS_FAILED;		mBatch.mStatus = Constants.BATCH_STATUS_FAILED;
	return;		return;
	}		}