Merge "Bluetooth: aim OPEN_RECEIVED_FILES at bluetooth" am: 17ad73ed9b am: 019c8f38fe

am: 14795a7855

Change-Id: If28610b01c89647b66f84561455e540c480d49fa
This commit is contained in:
Marie Janssen
2017-02-25 13:51:01 +00:00
committed by android-build-merger

View File

@@ -79,6 +79,8 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment implem
/* Private intent to show the list of received files */ /* Private intent to show the list of received files */
private static final String BTOPP_ACTION_OPEN_RECEIVED_FILES = private static final String BTOPP_ACTION_OPEN_RECEIVED_FILES =
"android.btopp.intent.action.OPEN_RECEIVED_FILES"; "android.btopp.intent.action.OPEN_RECEIVED_FILES";
private static final String BTOPP_PACKAGE =
"com.android.bluetooth";
private static final String KEY_PAIRED_DEVICES = "paired_devices"; private static final String KEY_PAIRED_DEVICES = "paired_devices";
@@ -266,6 +268,7 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment implem
mMetricsFeatureProvider.action(getActivity(), mMetricsFeatureProvider.action(getActivity(),
MetricsEvent.ACTION_BLUETOOTH_FILES); MetricsEvent.ACTION_BLUETOOTH_FILES);
Intent intent = new Intent(BTOPP_ACTION_OPEN_RECEIVED_FILES); Intent intent = new Intent(BTOPP_ACTION_OPEN_RECEIVED_FILES);
intent.setPackage(BTOPP_PACKAGE);
getActivity().sendBroadcast(intent); getActivity().sendBroadcast(intent);
return true; return true;
} }