Merge "OPP: Handle Stale Data Exception" am: c91445bcdb (3d252869) · Commits · e / os / android_packages_modules_Bluetooth

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

+16 −13

Original line number	Diff line number	Diff line
		@@ -38,6 +38,7 @@ import android.bluetooth.BluetoothAdapter;
		import android.content.DialogInterface;
		import android.content.Intent;
		import android.database.Cursor;
		import android.database.StaleDataException;
		import android.net.Uri;
		import android.os.Bundle;
		import android.util.Log;
		@@ -158,8 +159,7 @@ public class BluetoothOppTransferHistory extends Activity
		@Override
		public boolean onPrepareOptionsMenu(Menu menu) {
		if (!mShowAllIncoming) {
		boolean showClear = getClearableCount() > 0;
		menu.findItem(R.id.transfer_menu_clear_all).setEnabled(showClear);
		menu.findItem(R.id.transfer_menu_clear_all).setEnabled(isTransferComplete());
		}
		return super.onPrepareOptionsMenu(menu);
		}
		@@ -246,21 +246,24 @@ public class BluetoothOppTransferHistory extends Activity
		}

		/**
		* Get the number of finished transfers, including error and success.
		* Returns true if the device has finished transfers, including error and success.
		*/
		private int getClearableCount() {
		int count = 0;
		private boolean isTransferComplete() {
		try {
		if (mTransferCursor.moveToFirst()) {
		while (!mTransferCursor.isAfterLast()) {
		int statusColumnId = mTransferCursor.getColumnIndexOrThrow(BluetoothShare.STATUS);
		int statusColumnId = mTransferCursor
		.getColumnIndexOrThrow(BluetoothShare.STATUS);
		int status = mTransferCursor.getInt(statusColumnId);
		if (BluetoothShare.isStatusCompleted(status)) {
		count++;
		return true;
		}
		mTransferCursor.moveToNext();
		}
		}
		return count;
		} catch (StaleDataException e) {
		}
		return false;
		}

		/**