am 16d171b1: Merge "code cleanup. some unused import statement, local variabls, private members and static constants removed form classes in com.android.bluetooth/pbap package."

* commit '16d171b1ba7bd2b74c15b9f4d0289de84117cbb5':
  code cleanup. some unused import statement, local variabls, private members and static constants removed form classes in com.android.bluetooth/pbap package.

4 files changed, 0 insertions, 20 deletions

diff --git a/src/com/android/bluetooth/pbap/BluetoothPbapCallLogComposer.java b/src/com/android/bluetooth/pbap/BluetoothPbapCallLogComposer.java
index 74fefc88d..f395d214c 100644
--- a/src/com/android/bluetooth/pbap/BluetoothPbapCallLogComposer.java
+++ b/src/com/android/bluetooth/pbap/BluetoothPbapCallLogComposer.java
@@ -170,8 +170,6 @@ public class BluetoothPbapCallLogComposer {
         }
 
         if (mCareHandlerErrors) {
-            List<OneEntryHandler> finishedList = new ArrayList<OneEntryHandler>(
-                    mHandlerList.size());
             for (OneEntryHandler handler : mHandlerList) {
                 if (!handler.onEntryCreated(vcard)) {
                     return false;
diff --git a/src/com/android/bluetooth/pbap/BluetoothPbapObexServer.java b/src/com/android/bluetooth/pbap/BluetoothPbapObexServer.java
index fbfd8236a..eccd3a2e5 100644
--- a/src/com/android/bluetooth/pbap/BluetoothPbapObexServer.java
+++ b/src/com/android/bluetooth/pbap/BluetoothPbapObexServer.java
@@ -38,7 +38,6 @@ import android.os.Handler;
 import android.text.TextUtils;
 import android.util.Log;
 import android.provider.CallLog.Calls;
-import android.provider.ContactsContract.Contacts;
 import android.provider.CallLog;
 
 import java.io.IOException;
@@ -138,8 +137,6 @@ public class BluetoothPbapObexServer extends ServerRequestHandler {
     // record current path the client are browsing
     private String mCurrentPath = "";
 
-    private long mConnectionId;
-
     private Handler mCallback = null;
 
     private Context mContext;
@@ -170,7 +167,6 @@ public class BluetoothPbapObexServer extends ServerRequestHandler {
 
     public BluetoothPbapObexServer(Handler callback, Context context) {
         super();
-        mConnectionId = -1;
         mCallback = callback;
         mContext = context;
         mVcardManager = new BluetoothPbapVcardManager(mContext);
@@ -954,7 +950,6 @@ public class BluetoothPbapObexServer extends ServerRequestHandler {
         if (D) Log.d(TAG, "pullPhonebook(): requestSize=" + requestSize + " startPoint=" +
                 startPoint + " endPoint=" + endPoint);
 
-        String result = null;
         boolean vcard21 = appParamValue.vcard21;
         if (appParamValue.needTag == BluetoothPbapObexServer.ContentType.PHONEBOOK) {
             if (startPoint == 0) {
diff --git a/src/com/android/bluetooth/pbap/BluetoothPbapService.java b/src/com/android/bluetooth/pbap/BluetoothPbapService.java
index 069ab6935..3b1216e6f 100644
--- a/src/com/android/bluetooth/pbap/BluetoothPbapService.java
+++ b/src/com/android/bluetooth/pbap/BluetoothPbapService.java
@@ -40,7 +40,6 @@ import android.app.PendingIntent;
 import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
-import android.content.res.Resources;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothPbap;
@@ -51,13 +50,11 @@ import android.os.Handler;
 import android.os.IBinder;
 import android.os.Message;
 import android.os.PowerManager;
-import android.provider.ContactsContract.RawContacts;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.util.Log;
 
 import java.io.IOException;
-import java.util.ArrayList;
 
 import javax.obex.ServerSession;
 
@@ -565,7 +562,6 @@ public class BluetoothPbapService extends Service {
         public void handleMessage(Message msg) {
             if (VERBOSE) Log.v(TAG, "Handler(): got msg=" + msg.what);
 
-            CharSequence tmpTxt;
             switch (msg.what) {
                 case START_LISTENER:
                     if (mAdapter.isEnabled()) {
diff --git a/src/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java b/src/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
index d16a36f82..118403bd4 100644
--- a/src/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
+++ b/src/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
@@ -78,16 +78,8 @@ public class BluetoothPbapVcardManager {
             Contacts.DISPLAY_NAME, // 4
     };
 
-    private static final int ID_COLUMN_INDEX = 0;
-
-    private static final int PHONE_TYPE_COLUMN_INDEX = 1;
-
-    private static final int PHONE_LABEL_COLUMN_INDEX = 2;
-
     private static final int PHONE_NUMBER_COLUMN_INDEX = 3;
 
-    private static final int CONTACTS_DISPLAY_NAME_COLUMN_INDEX = 4;
-
     static final String SORT_ORDER_PHONE_NUMBER = CommonDataKinds.Phone.NUMBER + " ASC";
 
     static final String[] CONTACTS_PROJECTION = new String[] {
@@ -504,7 +496,6 @@ public class BluetoothPbapVcardManager {
      * Handler to emit VCard String to PCE once size grow to maxPacketSize.
      */
     public class HandlerForStringBuffer implements OneEntryHandler {
-        @SuppressWarnings("hiding")
         private Operation operation;
 
         private OutputStream outputStream;