Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c00ff414 authored by Jaikumar Ganesh's avatar Jaikumar Ganesh Committed by Android Git Automerger
Browse files

am 14d86ff4: Merge "Handle OBEX Abort packets sent from remote device" 

* commit '14d86ff4':
  Handle OBEX Abort packets sent from remote device
parents 744d62aa 14d86ff4

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

+6 −1
Original line number Diff line number Diff line
@@ -473,7 +473,12 @@ public class BluetoothOppObexServerSession extends ServerRequestHandler implemen 
                }

            } catch (IOException e1) {

                Log.e(TAG, "Error when receiving file");

                /* OBEX Abort packet received from remote device */

                if ("Abort Received".equals(e1.getMessage())) {

                    status = BluetoothShare.STATUS_CANCELED;

                } else {

                    status = BluetoothShare.STATUS_OBEX_DATA_ERROR;

                }

                error = true;

            }

        }