diff options
| author | Lalit Kansara <lkansara@codeaurora.org> | 2016-12-06 14:47:45 +0530 |
|---|---|---|
| committer | Lalit Kansara <lkansara@codeaurora.org> | 2016-12-06 14:47:45 +0530 |
| commit | aa2a937e6c8c9c93cc1a5fe344c368b4276243c1 (patch) | |
| tree | 05648e985b986d372f3a3d7f60cab8d6b77e244d /src/com/android/bluetooth/opp/BluetoothOppSendFileInfo.java | |
| parent | c7ae94e96c0c7bb93ec80d548c024a968c411d32 (diff) | |
| parent | 1c40f9218d815e4e67482fb8913fce6850e4fb1c (diff) | |
| download | android_packages_apps_Bluetooth-aa2a937e6c8c9c93cc1a5fe344c368b4276243c1.tar.gz android_packages_apps_Bluetooth-aa2a937e6c8c9c93cc1a5fe344c368b4276243c1.tar.bz2 android_packages_apps_Bluetooth-aa2a937e6c8c9c93cc1a5fe344c368b4276243c1.zip | |
Merge commit '1c40f9218d815e4e67482fb8913fce6850e4fb1c' into remote
Conflicts:
jni/com_android_bluetooth_hfp.cpp
src/com/android/bluetooth/avrcp/Avrcp.java
src/com/android/bluetooth/btservice/AdapterService.java
src/com/android/bluetooth/btservice/RemoteDevices.java
src/com/android/bluetooth/hfp/HeadsetStateMachine.java
src/com/android/bluetooth/map/BluetoothMapContentObserver.java
src/com/android/bluetooth/map/BluetoothMapService.java
src/com/android/bluetooth/opp/BluetoothOppSendFileInfo.java
src/com/android/bluetooth/pan/PanService.java
src/com/android/bluetooth/pbap/BluetoothPbapReceiver.java
Change-Id: I41068ac7787983519220fe6fee1e65ff66298db1
Diffstat (limited to 'src/com/android/bluetooth/opp/BluetoothOppSendFileInfo.java')
| -rw-r--r-- | src/com/android/bluetooth/opp/BluetoothOppSendFileInfo.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/bluetooth/opp/BluetoothOppSendFileInfo.java b/src/com/android/bluetooth/opp/BluetoothOppSendFileInfo.java index 2a9cadb8b..f60f06cab 100644 --- a/src/com/android/bluetooth/opp/BluetoothOppSendFileInfo.java +++ b/src/com/android/bluetooth/opp/BluetoothOppSendFileInfo.java @@ -123,6 +123,7 @@ public class BluetoothOppSendFileInfo { Log.e(TAG, "generateFileInfo: " + e); return new BluetoothOppSendFileInfo(fileName, contentType, length, null, 0); } + if (metadataCursor != null) { try { if (metadataCursor.moveToFirst()) { |