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

Commit 0352faa2 authored by Andre Eisenbach's avatar Andre Eisenbach Committed by Android Git Automerger
Browse files

am 7f7713f3: am 40f63fad: am af34ebd4: Fix compile errors due to OPP merge 

* commit '7f7713f3':
  Fix compile errors due to OPP merge
parents 0dbec7e7 7f7713f3

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

+1 −1
Original line number Diff line number Diff line
@@ -337,6 +337,7 @@ public class BluetoothOppObexClientSession implements BluetoothOppObexSession { 
        private int sendFile(BluetoothOppSendFileInfo fileInfo) {

            boolean error = false;

            int responseCode = -1;

            int position = 0;

            int status = BluetoothShare.STATUS_SUCCESS;

            Uri contentUri = Uri.parse(BluetoothShare.CONTENT_URI + "/" + mInfo.mId);

            ContentValues updateValues;
@@ -391,7 +392,6 @@ public class BluetoothOppObexClientSession implements BluetoothOppObexSession { 
                }



                if (!error) {

                    int position = 0;

                    int readLength = 0;

                    boolean okToProceed = false;

                    long timestamp = 0;

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

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ public class BluetoothOppObexServerSession extends ServerRequestHandler implemen 
     * Called when connection is accepted from remote, to retrieve the first

     * Header then wait for user confirmation

     */

    public void preStart(Handler handler) {

    public void preStart() {

        try {

            if (D) Log.d(TAG, "Create ServerSession with transport " + mTransport.toString());

            mSession = new ServerSession(mTransport, this, null);