Enable back bluetooth test cases

Removed testHeaderEncode as mmm-common is not used anymore and
this function is testing a third party library instead of bluetooth related function.

Bug: 20515454

Change-Id: Ib6a4a04b46f09db2b277ac23ffb038ea80f0f03e

2 files changed, 2 insertions, 11 deletions

diff --git a/tests/Android.mk b/tests/Android.mk
index 896d4663f..ff848d907 100755
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -5,7 +5,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE_TAGS := optional
 LOCAL_CERTIFICATE := platform
 
-LOCAL_JAVA_LIBRARIES := javax.obex android.test.runner telephony-common mms-common libprotobuf-java-2.3.0-micro
+LOCAL_JAVA_LIBRARIES := javax.obex android.test.runner telephony-common libprotobuf-java-micro
 LOCAL_STATIC_JAVA_LIBRARIES := com.android.emailcommon
 
 # Include all test java files.
@@ -16,4 +16,4 @@ LOCAL_PACKAGE_NAME := BluetoothProfileTests
 
 LOCAL_INSTRUMENTATION_FOR := Bluetooth
 
-# include $(BUILD_PACKAGE)
+include $(BUILD_PACKAGE)
diff --git a/tests/src/com/android/bluetooth/tests/BluetoothMapbMessageTest.java b/tests/src/com/android/bluetooth/tests/BluetoothMapbMessageTest.java
index 8724e9fb0..e57d9a4b7 100755
--- a/tests/src/com/android/bluetooth/tests/BluetoothMapbMessageTest.java
+++ b/tests/src/com/android/bluetooth/tests/BluetoothMapbMessageTest.java
@@ -8,9 +8,6 @@ import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 
-import org.apache.http.message.BasicHeaderElement;
-import org.apache.http.message.BasicHeaderValueFormatter;
-
 import android.test.AndroidTestCase;
 import android.util.Log;
 
@@ -521,12 +518,6 @@ public class BluetoothMapbMessageTest extends AndroidTestCase {
         }
     }
 
-    public void testHeaderEncode() {
-        BasicHeaderElement header = new BasicHeaderElement("To","Jørgen <joergen@hest.com>");
-        String headerStr = BasicHeaderValueFormatter.formatHeaderElement(header, true, BasicHeaderValueFormatter.DEFAULT);
-        if(D) Log.i(TAG, "The encoded header: " + headerStr);
-    }
-
     public void testQuotedPrintable() {
         testQuotedPrintableIso8859_1();
         testQuotedPrintableUTF_8();