Merge "BluetoohtOppReceiver: Minor if statement cleanup" into main (4b4907b6) · Commits · e / os / android_packages_modules_Bluetooth

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

+27 −30

Original line number	Diff line number	Diff line
		@@ -83,8 +83,8 @@ public class BluetoothOppReceiver extends BroadcastReceiver {
		toastMsg = context.getString(R.string.bt_toast_4, deviceName);
		}
		Toast.makeText(context, toastMsg, Toast.LENGTH_SHORT).show();
		} else if (action.equals(Constants.ACTION_INCOMING_FILE_CONFIRM)) {
		if (!Flags.oppStartActivityDirectlyFromNotification()) {
		} else if (action.equals(Constants.ACTION_INCOMING_FILE_CONFIRM)
		&& !Flags.oppStartActivityDirectlyFromNotification()) {
		if (V) {
		Log.v(TAG, "Receiver ACTION_INCOMING_FILE_CONFIRM");
		}
		@@ -94,7 +94,6 @@ public class BluetoothOppReceiver extends BroadcastReceiver {
		in.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
		in.setDataAndNormalize(uri);
		context.startActivity(in);
		}
		} else if (action.equals(Constants.ACTION_DECLINE)) {
		if (V) {
		Log.v(TAG, "Receiver ACTION_DECLINE");
		@@ -153,8 +152,8 @@ public class BluetoothOppReceiver extends BroadcastReceiver {
		context.startActivity(in);
		}

		} else if (action.equals(Constants.ACTION_OPEN_OUTBOUND_TRANSFER)) {
		if (!Flags.oppStartActivityDirectlyFromNotification()) {
		} else if (action.equals(Constants.ACTION_OPEN_OUTBOUND_TRANSFER)
		&& !Flags.oppStartActivityDirectlyFromNotification()) {
		if (V) {
		Log.v(TAG, "Received ACTION_OPEN_OUTBOUND_TRANSFER.");
		}
		@@ -163,9 +162,8 @@ public class BluetoothOppReceiver extends BroadcastReceiver {
		in.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK \| Intent.FLAG_ACTIVITY_CLEAR_TOP);
		in.putExtra(Constants.EXTRA_DIRECTION, BluetoothShare.DIRECTION_OUTBOUND);
		context.startActivity(in);
		}
		} else if (action.equals(Constants.ACTION_OPEN_INBOUND_TRANSFER)) {
		if (!Flags.oppStartActivityDirectlyFromNotification()) {
		} else if (action.equals(Constants.ACTION_OPEN_INBOUND_TRANSFER)
		&& !Flags.oppStartActivityDirectlyFromNotification()) {
		if (V) {
		Log.v(TAG, "Received ACTION_OPEN_INBOUND_TRANSFER.");
		}
		@@ -174,7 +172,6 @@ public class BluetoothOppReceiver extends BroadcastReceiver {
		in.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK \| Intent.FLAG_ACTIVITY_CLEAR_TOP);
		in.putExtra(Constants.EXTRA_DIRECTION, BluetoothShare.DIRECTION_INBOUND);
		context.startActivity(in);
		}
		} else if (action.equals(Constants.ACTION_HIDE)) {
		if (V) {
		Log.v(TAG, "Receiver hide for " + intent.getData());