From db94389c30d5ad5555a922d28868b119e1c6f2e1 Mon Sep 17 00:00:00 2001 From: Andre Eisenbach Date: Tue, 23 Jun 2015 12:23:53 -0700 Subject: [PATCH] Fix compile errors due to OPP merge Change-Id: Ia07d99d58785c7e974b1fb32afaeb157ad337932 --- src/com/android/bluetooth/opp/BluetoothOppObexClientSession.java | 2 +- src/com/android/bluetooth/opp/BluetoothOppObexServerSession.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/android/bluetooth/opp/BluetoothOppObexClientSession.java b/src/com/android/bluetooth/opp/BluetoothOppObexClientSession.java index f8e0ca8e..1a8ac6c9 100644 --- a/src/com/android/bluetooth/opp/BluetoothOppObexClientSession.java +++ b/src/com/android/bluetooth/opp/BluetoothOppObexClientSession.java @@ -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; diff --git a/src/com/android/bluetooth/opp/BluetoothOppObexServerSession.java b/src/com/android/bluetooth/opp/BluetoothOppObexServerSession.java index af458d7c..ffb00e9d 100644 --- a/src/com/android/bluetooth/opp/BluetoothOppObexServerSession.java +++ b/src/com/android/bluetooth/opp/BluetoothOppObexServerSession.java @@ -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); -- 2.11.0