Cleanup unused requires in java files
Change-Id: I7b055c1d3d3f6a69e9f49c077853ab45fcad7106
diff --git a/lib/mapapi/com/android/bluetooth/mapapi/BluetoothMapEmailProvider.java b/lib/mapapi/com/android/bluetooth/mapapi/BluetoothMapEmailProvider.java
index d95148f..23ccc70 100644
--- a/lib/mapapi/com/android/bluetooth/mapapi/BluetoothMapEmailProvider.java
+++ b/lib/mapapi/com/android/bluetooth/mapapi/BluetoothMapEmailProvider.java
@@ -36,8 +36,6 @@
import java.io.IOException;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
/**
* A base implementation of the BluetoothMapEmailContract.
diff --git a/lib/mapapi/com/android/bluetooth/mapapi/BluetoothMapIMProvider.java b/lib/mapapi/com/android/bluetooth/mapapi/BluetoothMapIMProvider.java
index d0c642c..cc3c311 100644
--- a/lib/mapapi/com/android/bluetooth/mapapi/BluetoothMapIMProvider.java
+++ b/lib/mapapi/com/android/bluetooth/mapapi/BluetoothMapIMProvider.java
@@ -23,16 +23,10 @@
import android.content.pm.ProviderInfo;
import android.database.Cursor;
import android.net.Uri;
-import android.os.AsyncTask;
import android.os.Binder;
import android.os.Bundle;
-import android.os.ParcelFileDescriptor;
import android.util.Log;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
diff --git a/src/com/android/bluetooth/ObexRejectServer.java b/src/com/android/bluetooth/ObexRejectServer.java
index a68f4b8..7cfa0a3 100644
--- a/src/com/android/bluetooth/ObexRejectServer.java
+++ b/src/com/android/bluetooth/ObexRejectServer.java
@@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package com.android.bluetooth;
import java.io.IOException;
diff --git a/src/com/android/bluetooth/ObexServerSockets.java b/src/com/android/bluetooth/ObexServerSockets.java
index f5b7363..4b41105 100644
--- a/src/com/android/bluetooth/ObexServerSockets.java
+++ b/src/com/android/bluetooth/ObexServerSockets.java
@@ -15,9 +15,7 @@
package com.android.bluetooth;
import java.io.IOException;
-import java.util.concurrent.CountDownLatch;
-import javax.obex.ObexSession;
import javax.obex.ResponseCodes;
import javax.obex.ServerSession;
diff --git a/src/com/android/bluetooth/SignedLongLong.java b/src/com/android/bluetooth/SignedLongLong.java
index 42fd4a8..de18fbb 100644
--- a/src/com/android/bluetooth/SignedLongLong.java
+++ b/src/com/android/bluetooth/SignedLongLong.java
@@ -16,10 +16,10 @@
package com.android.bluetooth;
-import java.io.UnsupportedEncodingException;
-
import com.android.bluetooth.map.BluetoothMapUtils;
+import java.io.UnsupportedEncodingException;
+
/**
* Class to represent a 128bit value using two long member variables.
* Has functionality to convert to/from hex-strings.
diff --git a/src/com/android/bluetooth/a2dp/A2dpService.java b/src/com/android/bluetooth/a2dp/A2dpService.java
index 41c31d1..bdc3533 100755
--- a/src/com/android/bluetooth/a2dp/A2dpService.java
+++ b/src/com/android/bluetooth/a2dp/A2dpService.java
@@ -20,8 +20,6 @@
import android.bluetooth.BluetoothProfile;
import android.bluetooth.BluetoothUuid;
import android.bluetooth.IBluetoothA2dp;
-import android.content.Context;
-import android.content.Intent;
import android.os.ParcelUuid;
import android.provider.Settings;
import android.util.Log;
@@ -29,9 +27,7 @@
import com.android.bluetooth.btservice.ProfileService;
import com.android.bluetooth.Utils;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
-import java.util.Map;
/**
* Provides Bluetooth A2DP profile, as a service in the Bluetooth application.
diff --git a/src/com/android/bluetooth/a2dp/A2dpSinkService.java b/src/com/android/bluetooth/a2dp/A2dpSinkService.java
index 51c9c4c..12a680a 100644
--- a/src/com/android/bluetooth/a2dp/A2dpSinkService.java
+++ b/src/com/android/bluetooth/a2dp/A2dpSinkService.java
@@ -22,11 +22,12 @@
import android.bluetooth.IBluetoothA2dpSink;
import android.provider.Settings;
import android.util.Log;
+
import com.android.bluetooth.btservice.ProfileService;
import com.android.bluetooth.Utils;
+
import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
/**
* Provides Bluetooth A2DP Sink profile, as a service in the Bluetooth application.
diff --git a/src/com/android/bluetooth/a2dp/A2dpSinkStateMachine.java b/src/com/android/bluetooth/a2dp/A2dpSinkStateMachine.java
index 29b8bc8..0745642 100644
--- a/src/com/android/bluetooth/a2dp/A2dpSinkStateMachine.java
+++ b/src/com/android/bluetooth/a2dp/A2dpSinkStateMachine.java
@@ -35,9 +35,9 @@
import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothProfile;
import android.bluetooth.BluetoothUuid;
-import android.bluetooth.IBluetooth;
import android.content.BroadcastReceiver;
import android.content.Context;
+import android.content.Intent;
import android.media.AudioFormat;
import android.media.AudioManager;
import android.media.AudioManager.OnAudioFocusChangeListener;
@@ -51,12 +51,8 @@
import android.os.ParcelUuid;
import android.os.PowerManager;
import android.os.PowerManager.WakeLock;
-import android.content.Intent;
-import android.os.Message;
-import android.os.RemoteException;
-import android.os.ServiceManager;
-import android.os.ParcelUuid;
import android.util.Log;
+
import com.android.bluetooth.Utils;
import com.android.bluetooth.btservice.AdapterService;
import com.android.bluetooth.btservice.ProfileService;
@@ -64,6 +60,7 @@
import com.android.internal.util.IState;
import com.android.internal.util.State;
import com.android.internal.util.StateMachine;
+
import java.util.ArrayList;
import java.util.List;
import java.util.HashMap;
diff --git a/src/com/android/bluetooth/a2dp/A2dpStateMachine.java b/src/com/android/bluetooth/a2dp/A2dpStateMachine.java
index 7ad4a59..7ae131f 100755
--- a/src/com/android/bluetooth/a2dp/A2dpStateMachine.java
+++ b/src/com/android/bluetooth/a2dp/A2dpStateMachine.java
@@ -33,26 +33,23 @@
import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothProfile;
import android.bluetooth.BluetoothUuid;
-import android.bluetooth.IBluetooth;
import android.content.Context;
+import android.content.Intent;
import android.media.AudioManager;
import android.os.Handler;
import android.os.Message;
import android.os.ParcelUuid;
import android.os.PowerManager;
import android.os.PowerManager.WakeLock;
-import android.content.Intent;
-import android.os.Message;
-import android.os.RemoteException;
-import android.os.ServiceManager;
-import android.os.ParcelUuid;
import android.util.Log;
+
import com.android.bluetooth.Utils;
import com.android.bluetooth.btservice.AdapterService;
import com.android.bluetooth.btservice.ProfileService;
import com.android.internal.util.IState;
import com.android.internal.util.State;
import com.android.internal.util.StateMachine;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
diff --git a/src/com/android/bluetooth/avrcp/Avrcp.java b/src/com/android/bluetooth/avrcp/Avrcp.java
index 50f7e08..594b2e7 100755
--- a/src/com/android/bluetooth/avrcp/Avrcp.java
+++ b/src/com/android/bluetooth/avrcp/Avrcp.java
@@ -16,49 +16,33 @@
package com.android.bluetooth.avrcp;
-import java.util.Timer;
-import java.util.TimerTask;
-
import android.bluetooth.BluetoothA2dp;
import android.bluetooth.BluetoothAvrcp;
import android.content.Context;
-import android.content.Intent;
import android.content.res.Resources;
import android.content.SharedPreferences;
-import android.graphics.Bitmap;
import android.media.AudioManager;
import android.media.MediaDescription;
import android.media.MediaMetadata;
import android.media.session.MediaController;
import android.media.session.MediaSessionManager;
import android.media.session.PlaybackState;
-import android.os.Bundle;
import android.os.Handler;
import android.os.HandlerThread;
import android.os.Looper;
import android.os.Message;
-import android.os.ParcelUuid;
-import android.os.PowerManager;
-import android.os.PowerManager.WakeLock;
-import android.os.RemoteException;
-import android.os.ServiceManager;
import android.os.SystemClock;
import android.util.Log;
import android.view.KeyEvent;
import com.android.bluetooth.R;
-import com.android.bluetooth.btservice.AdapterService;
import com.android.bluetooth.btservice.ProfileService;
import com.android.bluetooth.Utils;
-import com.android.internal.util.IState;
-import com.android.internal.util.State;
-import com.android.internal.util.StateMachine;
-import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
-import java.util.Set;
+
/**
* support Bluetooth AVRCP profile.
* support metadata, play status and event notification
diff --git a/src/com/android/bluetooth/avrcp/AvrcpControllerClasses.java b/src/com/android/bluetooth/avrcp/AvrcpControllerClasses.java
index 422bcfe..0cfa4f6 100644
--- a/src/com/android/bluetooth/avrcp/AvrcpControllerClasses.java
+++ b/src/com/android/bluetooth/avrcp/AvrcpControllerClasses.java
@@ -18,16 +18,13 @@
import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothAvrcpPlayerSettings;
-import com.android.bluetooth.Utils;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.HashMap;
-import android.util.Log;
-import java.nio.charset.Charset;
-import java.nio.ByteBuffer;
-import android.media.session.PlaybackState;
import android.media.MediaMetadata;
+import android.media.session.PlaybackState;
+import android.util.Log;
+
+import java.util.ArrayList;
+import java.nio.ByteBuffer;
+
/**
* Provides helper classes used by other AvrcpControllerClasses.
*/
diff --git a/src/com/android/bluetooth/avrcp/AvrcpControllerConstants.java b/src/com/android/bluetooth/avrcp/AvrcpControllerConstants.java
index 45dfd0a..43e9f43 100644
--- a/src/com/android/bluetooth/avrcp/AvrcpControllerConstants.java
+++ b/src/com/android/bluetooth/avrcp/AvrcpControllerConstants.java
@@ -16,17 +16,6 @@
package com.android.bluetooth.avrcp;
-import android.util.Log;
-
-import com.android.bluetooth.Utils;
-
-import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-
/**
* Provides helper classes used by other AvrcpControllerClasses.
* Don't change this file without changing HAL Constants in bt_rc.h
diff --git a/src/com/android/bluetooth/avrcp/AvrcpControllerService.java b/src/com/android/bluetooth/avrcp/AvrcpControllerService.java
index d18cfc2..0c59a35 100644
--- a/src/com/android/bluetooth/avrcp/AvrcpControllerService.java
+++ b/src/com/android/bluetooth/avrcp/AvrcpControllerService.java
@@ -34,15 +34,16 @@
import android.os.Message;
import android.util.Log;
import android.media.AudioManager;
+
import com.android.bluetooth.a2dp.A2dpSinkService;
import com.android.bluetooth.btservice.ProfileService;
import com.android.bluetooth.Utils;
+
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
-import java.util.HashMap;
import java.nio.charset.Charset;
import java.nio.ByteBuffer;
+
/**
* Provides Bluetooth AVRCP Controller profile, as a service in the Bluetooth application.
* @hide
diff --git a/src/com/android/bluetooth/avrcp/NowPlaying.java b/src/com/android/bluetooth/avrcp/NowPlaying.java
index f78d7a6..2bde3f4 100644
--- a/src/com/android/bluetooth/avrcp/NowPlaying.java
+++ b/src/com/android/bluetooth/avrcp/NowPlaying.java
@@ -16,16 +16,7 @@
package com.android.bluetooth.avrcp;
-import android.util.Log;
-
-import com.android.bluetooth.Utils;
-
-import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
/**
* Provides Bluetooth AVRCP Controller profile, as a service in the Bluetooth application.
diff --git a/src/com/android/bluetooth/avrcp/RemoteMediaPlayers.java b/src/com/android/bluetooth/avrcp/RemoteMediaPlayers.java
index 177742a..c7786e9 100644
--- a/src/com/android/bluetooth/avrcp/RemoteMediaPlayers.java
+++ b/src/com/android/bluetooth/avrcp/RemoteMediaPlayers.java
@@ -16,16 +16,7 @@
package com.android.bluetooth.avrcp;
-import android.util.Log;
-
-import com.android.bluetooth.Utils;
-
-import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
/**
* Provides Bluetooth AVRCP Controller profile, as a service in the Bluetooth application.
diff --git a/src/com/android/bluetooth/btservice/AdapterProperties.java b/src/com/android/bluetooth/btservice/AdapterProperties.java
index 049c594..382b8fc 100644
--- a/src/com/android/bluetooth/btservice/AdapterProperties.java
+++ b/src/com/android/bluetooth/btservice/AdapterProperties.java
@@ -19,7 +19,6 @@
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothProfile;
-import android.content.Context;
import android.content.Intent;
import android.os.ParcelUuid;
import android.os.UserHandle;
@@ -30,7 +29,6 @@
import com.android.bluetooth.btservice.RemoteDevices.DeviceProperties;
import java.util.HashMap;
-import java.util.ArrayList;
import java.util.concurrent.CopyOnWriteArrayList;
class AdapterProperties {
diff --git a/src/com/android/bluetooth/btservice/AdapterService.java b/src/com/android/bluetooth/btservice/AdapterService.java
index 3ff2980..f0ecf5b 100644
--- a/src/com/android/bluetooth/btservice/AdapterService.java
+++ b/src/com/android/bluetooth/btservice/AdapterService.java
@@ -21,7 +21,6 @@
package com.android.bluetooth.btservice;
import android.app.AlarmManager;
-import android.app.Application;
import android.app.PendingIntent;
import android.app.Service;
import android.bluetooth.BluetoothAdapter;
@@ -30,12 +29,9 @@
import android.bluetooth.BluetoothUuid;
import android.bluetooth.IBluetooth;
import android.bluetooth.IBluetoothCallback;
-import android.bluetooth.IBluetoothManager;
-import android.bluetooth.IBluetoothManagerCallback;
import android.bluetooth.BluetoothActivityEnergyInfo;
import android.bluetooth.OobData;
import android.content.BroadcastReceiver;
-import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
@@ -52,19 +48,15 @@
import android.os.RemoteCallbackList;
import android.os.RemoteException;
import android.os.SystemClock;
-import android.provider.Settings;
import android.text.TextUtils;
import android.util.Base64;
import android.util.EventLog;
import android.util.Log;
-import android.util.Pair;
import com.android.bluetooth.a2dp.A2dpService;
import com.android.bluetooth.a2dp.A2dpSinkService;
import com.android.bluetooth.hid.HidService;
import com.android.bluetooth.hfp.HeadsetService;
-import com.android.bluetooth.hdp.HealthService;
-import com.android.bluetooth.pan.PanService;
import com.android.bluetooth.sdp.SdpManager;
import com.android.internal.R;
import com.android.bluetooth.Utils;
@@ -72,21 +64,16 @@
import java.io.FileDescriptor;
import java.io.FileOutputStream;
-import java.io.FileWriter;
import java.io.IOException;
import java.io.PrintWriter;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Set;
import java.util.Map;
import java.util.Iterator;
import java.util.Map.Entry;
import java.util.List;
-import android.content.pm.PackageManager;
-import android.os.ServiceManager;
-
public class AdapterService extends Service {
private static final String TAG = "BluetoothAdapterService";
private static final boolean DBG = false;
@@ -131,8 +118,6 @@
private static final String SIM_ACCESS_PERMISSION_PREFERENCE_FILE =
"sim_access_permission";
- private static final int ADAPTER_SERVICE_TYPE=Service.START_STICKY;
-
private static final String[] DEVICE_TYPE_NAMES = new String[] {
"???",
"BR/EDR",
@@ -2128,8 +2113,8 @@
enforceCallingOrSelfPermission(android.Manifest.permission.DUMP, TAG);
if (args.length > 0) {
- debugLog("dumpsys arguments, check for protobuf output: " +
- TextUtils.join(" ", args));
+ debugLog("dumpsys arguments, check for protobuf output: "
+ + TextUtils.join(" ", args));
if (args[0].startsWith("--proto")) {
if (args[0].equals("--proto-java-bin")) {
dumpJava(fd);
@@ -2156,9 +2141,9 @@
writer.println("Bonded devices:");
for (BluetoothDevice device : getBondedDevices()) {
- writer.println(" " + device.getAddress() +
- " [" + DEVICE_TYPE_NAMES[device.getType()] + "] " +
- device.getName());
+ writer.println(" " + device.getAddress()
+ + " [" + DEVICE_TYPE_NAMES[device.getType()] + "] "
+ + device.getName());
}
// Dump profile information
diff --git a/src/com/android/bluetooth/btservice/AdapterState.java b/src/com/android/bluetooth/btservice/AdapterState.java
index 8e4790f..f0e8099 100644
--- a/src/com/android/bluetooth/btservice/AdapterState.java
+++ b/src/com/android/bluetooth/btservice/AdapterState.java
@@ -17,8 +17,6 @@
package com.android.bluetooth.btservice;
import android.bluetooth.BluetoothAdapter;
-import android.content.Context;
-import android.content.Intent;
import android.os.Message;
import android.os.UserManager;
import android.util.Log;
diff --git a/src/com/android/bluetooth/btservice/BondStateMachine.java b/src/com/android/bluetooth/btservice/BondStateMachine.java
index 353157e..9d4853d 100644
--- a/src/com/android/bluetooth/btservice/BondStateMachine.java
+++ b/src/com/android/bluetooth/btservice/BondStateMachine.java
@@ -25,7 +25,6 @@
import com.android.bluetooth.hfp.HeadsetService;
import android.bluetooth.OobData;
-import android.content.Context;
import android.content.Intent;
import android.os.Message;
import android.os.UserHandle;
diff --git a/src/com/android/bluetooth/btservice/Config.java b/src/com/android/bluetooth/btservice/Config.java
index 0fc4718..1046c30 100644
--- a/src/com/android/bluetooth/btservice/Config.java
+++ b/src/com/android/bluetooth/btservice/Config.java
@@ -17,14 +17,11 @@
package com.android.bluetooth.btservice;
import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
import android.bluetooth.BluetoothProfile;
import android.content.ContentResolver;
import android.content.Context;
import android.content.res.Resources;
-import android.os.SystemProperties;
import android.provider.Settings;
import android.util.Log;
diff --git a/src/com/android/bluetooth/btservice/ProfileService.java b/src/com/android/bluetooth/btservice/ProfileService.java
index 0202947..a67bc7b 100644
--- a/src/com/android/bluetooth/btservice/ProfileService.java
+++ b/src/com/android/bluetooth/btservice/ProfileService.java
@@ -23,8 +23,6 @@
import android.app.Service;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothProfile;
-import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.os.IBinder;
diff --git a/src/com/android/bluetooth/btservice/RemoteDevices.java b/src/com/android/bluetooth/btservice/RemoteDevices.java
index 3ae2455..6a8a69b 100644
--- a/src/com/android/bluetooth/btservice/RemoteDevices.java
+++ b/src/com/android/bluetooth/btservice/RemoteDevices.java
@@ -27,7 +27,6 @@
import com.android.bluetooth.Utils;
-import java.util.concurrent.atomic.AtomicInteger;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/src/com/android/bluetooth/gatt/CallbackInfo.java b/src/com/android/bluetooth/gatt/CallbackInfo.java
index db70a53..3b23d71 100644
--- a/src/com/android/bluetooth/gatt/CallbackInfo.java
+++ b/src/com/android/bluetooth/gatt/CallbackInfo.java
@@ -15,8 +15,6 @@
*/
package com.android.bluetooth.gatt;
-import java.util.UUID;
-
/**
* Helper class that keeps track of callback parameters for app callbacks.
* These are held during congestion and reported when congestion clears.
diff --git a/src/com/android/bluetooth/gatt/ContextMap.java b/src/com/android/bluetooth/gatt/ContextMap.java
index e3044d5..34ac104 100644
--- a/src/com/android/bluetooth/gatt/ContextMap.java
+++ b/src/com/android/bluetooth/gatt/ContextMap.java
@@ -15,7 +15,6 @@
*/
package com.android.bluetooth.gatt;
-import android.content.Context;
import android.os.Binder;
import android.os.IBinder;
import android.os.IBinder.DeathRecipient;
diff --git a/src/com/android/bluetooth/gatt/GattDbElement.java b/src/com/android/bluetooth/gatt/GattDbElement.java
index 6be1dc6..c75cb33 100644
--- a/src/com/android/bluetooth/gatt/GattDbElement.java
+++ b/src/com/android/bluetooth/gatt/GattDbElement.java
@@ -16,9 +16,6 @@
package com.android.bluetooth.gatt;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
import java.util.UUID;
/**
@@ -53,4 +50,4 @@
* the characteristic.
*/
public int properties;
-}
\ No newline at end of file
+}
diff --git a/src/com/android/bluetooth/gatt/GattService.java b/src/com/android/bluetooth/gatt/GattService.java
index a07ae22..7aef80c 100644
--- a/src/com/android/bluetooth/gatt/GattService.java
+++ b/src/com/android/bluetooth/gatt/GattService.java
@@ -23,7 +23,6 @@
import android.bluetooth.BluetoothGatt;
import android.bluetooth.BluetoothGattCharacteristic;
import android.bluetooth.BluetoothGattDescriptor;
-import android.bluetooth.BluetoothGattIncludedService;
import android.bluetooth.BluetoothGattService;
import android.bluetooth.BluetoothProfile;
import android.bluetooth.IBluetoothGatt;
@@ -38,12 +37,10 @@
import android.bluetooth.le.ScanResult;
import android.bluetooth.le.ScanSettings;
import android.content.Intent;
-import android.os.Binder;
import android.os.IBinder;
import android.os.ParcelUuid;
import android.os.RemoteException;
import android.os.SystemClock;
-import android.os.UserHandle;
import android.provider.Settings;
import android.util.Log;
diff --git a/src/com/android/bluetooth/gatt/ServiceDeclaration.java b/src/com/android/bluetooth/gatt/ServiceDeclaration.java
index 1d0bc4e..14e825c 100644
--- a/src/com/android/bluetooth/gatt/ServiceDeclaration.java
+++ b/src/com/android/bluetooth/gatt/ServiceDeclaration.java
@@ -15,9 +15,7 @@
*/
package com.android.bluetooth.gatt;
-import android.util.Log;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import java.util.UUID;
diff --git a/src/com/android/bluetooth/hdp/HealthService.java b/src/com/android/bluetooth/hdp/HealthService.java
index 8d8eff7..d9ae79f 100644
--- a/src/com/android/bluetooth/hdp/HealthService.java
+++ b/src/com/android/bluetooth/hdp/HealthService.java
@@ -20,11 +20,9 @@
import android.bluetooth.BluetoothHealth;
import android.bluetooth.BluetoothHealthAppConfiguration;
import android.bluetooth.BluetoothProfile;
-import android.bluetooth.IBluetooth;
import android.bluetooth.IBluetoothHealth;
import android.bluetooth.IBluetoothHealthCallback;
import android.content.Intent;
-import android.content.pm.PackageManager;
import android.os.Handler;
import android.os.HandlerThread;
import android.os.IBinder;
@@ -33,7 +31,6 @@
import android.os.Message;
import android.os.ParcelFileDescriptor;
import android.os.RemoteException;
-import android.os.ServiceManager;
import android.util.Log;
import com.android.bluetooth.btservice.ProfileService;
import com.android.bluetooth.btservice.ProfileService.IProfileServiceBinder;
@@ -113,10 +110,10 @@
private void cleanupApps(){
if (mApps != null) {
- Iterator <Map.Entry<BluetoothHealthAppConfiguration,AppInfo>>it
+ Iterator<Map.Entry<BluetoothHealthAppConfiguration,AppInfo>> it
= mApps.entrySet().iterator();
while (it.hasNext()) {
- Map.Entry<BluetoothHealthAppConfiguration,AppInfo> entry = it.next();
+ Map.Entry<BluetoothHealthAppConfiguration,AppInfo> entry = it.next();
AppInfo appInfo = entry.getValue();
if (appInfo != null)
appInfo.cleanup();
diff --git a/src/com/android/bluetooth/hfp/HeadsetPhoneState.java b/src/com/android/bluetooth/hfp/HeadsetPhoneState.java
index bdf9c06..1f1750c 100644
--- a/src/com/android/bluetooth/hfp/HeadsetPhoneState.java
+++ b/src/com/android/bluetooth/hfp/HeadsetPhoneState.java
@@ -16,6 +16,7 @@
package com.android.bluetooth.hfp;
+import android.bluetooth.BluetoothDevice;
import android.content.Context;
import android.telephony.PhoneStateListener;
import android.telephony.ServiceState;
@@ -24,7 +25,6 @@
import android.telephony.SubscriptionManager;
import android.telephony.SubscriptionManager.OnSubscriptionsChangedListener;
import android.util.Log;
-import android.bluetooth.BluetoothDevice;
// Note:
diff --git a/src/com/android/bluetooth/hfp/HeadsetService.java b/src/com/android/bluetooth/hfp/HeadsetService.java
index 10bf23a..2a8273b 100755
--- a/src/com/android/bluetooth/hfp/HeadsetService.java
+++ b/src/com/android/bluetooth/hfp/HeadsetService.java
@@ -24,9 +24,7 @@
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
-import android.content.pm.PackageManager;
import android.media.AudioManager;
-import android.os.Handler;
import android.os.Message;
import android.provider.Settings;
import android.util.Log;
@@ -34,8 +32,6 @@
import com.android.bluetooth.Utils;
import java.util.ArrayList;
import java.util.List;
-import java.util.Iterator;
-import java.util.Map;
/**
* Provides Bluetooth Headset and Handsfree profile, as a service in
diff --git a/src/com/android/bluetooth/hfp/HeadsetStateMachine.java b/src/com/android/bluetooth/hfp/HeadsetStateMachine.java
index 66d75d3..7e2a99b 100644
--- a/src/com/android/bluetooth/hfp/HeadsetStateMachine.java
+++ b/src/com/android/bluetooth/hfp/HeadsetStateMachine.java
@@ -38,7 +38,6 @@
import android.bluetooth.BluetoothHeadset;
import android.bluetooth.BluetoothProfile;
import android.bluetooth.BluetoothUuid;
-import android.bluetooth.IBluetooth;
import android.bluetooth.IBluetoothHeadsetPhone;
import android.content.ComponentName;
import android.content.Context;
diff --git a/src/com/android/bluetooth/hfpclient/HeadsetClientService.java b/src/com/android/bluetooth/hfpclient/HeadsetClientService.java
index 484eda0..70b1e5d 100644
--- a/src/com/android/bluetooth/hfpclient/HeadsetClientService.java
+++ b/src/com/android/bluetooth/hfpclient/HeadsetClientService.java
@@ -1,6 +1,5 @@
/*
* Copyright (c) 2014 The Android Open Source Project
- * Copyright (C) 2012 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -31,8 +30,10 @@
import android.os.Message;
import android.provider.Settings;
import android.util.Log;
+
import com.android.bluetooth.btservice.ProfileService;
import com.android.bluetooth.Utils;
+
import java.util.ArrayList;
import java.util.List;
diff --git a/src/com/android/bluetooth/hfpclient/HeadsetClientStateMachine.java b/src/com/android/bluetooth/hfpclient/HeadsetClientStateMachine.java
index 4bdbeb5..996255f 100644
--- a/src/com/android/bluetooth/hfpclient/HeadsetClientStateMachine.java
+++ b/src/com/android/bluetooth/hfpclient/HeadsetClientStateMachine.java
@@ -40,17 +40,14 @@
import android.bluetooth.BluetoothHeadsetClientCall;
import android.bluetooth.BluetoothProfile;
import android.bluetooth.BluetoothUuid;
+import android.content.Context;
+import android.content.Intent;
+import android.media.AudioManager;
import android.os.Bundle;
import android.os.Message;
import android.os.ParcelUuid;
import android.util.Log;
import android.util.Pair;
-import android.content.Context;
-import android.content.Intent;
-import android.media.AudioManager;
-import android.media.Ringtone;
-import android.media.RingtoneManager;
-import android.net.Uri;
import com.android.internal.util.IState;
import com.android.internal.util.State;
diff --git a/src/com/android/bluetooth/hid/HidService.java b/src/com/android/bluetooth/hid/HidService.java
index be769fc..2358792 100755
--- a/src/com/android/bluetooth/hid/HidService.java
+++ b/src/com/android/bluetooth/hid/HidService.java
@@ -19,28 +19,24 @@
import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothInputDevice;
import android.bluetooth.BluetoothProfile;
-import android.bluetooth.IBluetooth;
import android.bluetooth.IBluetoothInputDevice;
import android.content.Intent;
-import android.content.pm.PackageManager;
import android.os.Bundle;
-import android.os.IBinder;
import android.os.Handler;
import android.os.Message;
-import android.os.RemoteException;
-import android.os.ServiceManager;
import android.provider.Settings;
import android.util.Log;
+
import com.android.bluetooth.btservice.AdapterService;
import com.android.bluetooth.btservice.ProfileService;
import com.android.bluetooth.Utils;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
/**
* Provides Bluetooth Hid Host profile, as a service in
* the Bluetooth application.
@@ -546,15 +542,8 @@
}
return sendDataNative(Utils.getByteAddress(device), report);
- /*Message msg = mHandler.obtainMessage(MESSAGE_SEND_DATA);
- msg.obj = device;
- Bundle data = new Bundle();
- data.putString(BluetoothInputDevice.EXTRA_REPORT, report);
- msg.setData(data);
- mHandler.sendMessage(msg);
- return true ;*/
}
-
+
private void onGetProtocolMode(byte[] address, int mode) {
Message msg = mHandler.obtainMessage(MESSAGE_ON_GET_PROTOCOL_MODE);
msg.obj = address;
diff --git a/src/com/android/bluetooth/map/BluetoothMapAccountLoader.java b/src/com/android/bluetooth/map/BluetoothMapAccountLoader.java
index 4fa2599..8c36840 100644
--- a/src/com/android/bluetooth/map/BluetoothMapAccountLoader.java
+++ b/src/com/android/bluetooth/map/BluetoothMapAccountLoader.java
@@ -19,28 +19,23 @@
import java.util.LinkedHashMap;
import java.util.List;
-import com.android.bluetooth.map.BluetoothMapAccountItem;
-import com.android.bluetooth.map.BluetoothMapUtils.TYPE;
-
-
-
import android.content.ContentProviderClient;
import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
import android.content.pm.ProviderInfo;
import android.content.pm.ResolveInfo;
import android.database.Cursor;
import android.net.Uri;
import android.os.RemoteException;
-import com.android.bluetooth.mapapi.BluetoothMapContract;
import android.text.format.DateUtils;
import android.util.Log;
+import com.android.bluetooth.map.BluetoothMapAccountItem;
+import com.android.bluetooth.map.BluetoothMapUtils.TYPE;
+import com.android.bluetooth.mapapi.BluetoothMapContract;
public class BluetoothMapAccountLoader {
private static final String TAG = "BluetoothMapAccountLoader";
diff --git a/src/com/android/bluetooth/map/BluetoothMapAppObserver.java b/src/com/android/bluetooth/map/BluetoothMapAppObserver.java
index 6363415..2d603f7 100644
--- a/src/com/android/bluetooth/map/BluetoothMapAppObserver.java
+++ b/src/com/android/bluetooth/map/BluetoothMapAppObserver.java
@@ -23,16 +23,14 @@
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
-import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
import android.content.pm.ResolveInfo;
import android.database.ContentObserver;
import android.net.Uri;
-import android.os.Handler;
-import com.android.bluetooth.mapapi.BluetoothMapContract;
import android.util.Log;
+import com.android.bluetooth.mapapi.BluetoothMapContract;
+
/**
* Class to construct content observers for for email applications on the system.
*
diff --git a/src/com/android/bluetooth/map/BluetoothMapAppParams.java b/src/com/android/bluetooth/map/BluetoothMapAppParams.java
index 4aaed63..300b122 100644
--- a/src/com/android/bluetooth/map/BluetoothMapAppParams.java
+++ b/src/com/android/bluetooth/map/BluetoothMapAppParams.java
@@ -21,7 +21,6 @@
import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Date;
-import java.util.UUID;
import android.util.Log;
diff --git a/src/com/android/bluetooth/map/BluetoothMapContent.java b/src/com/android/bluetooth/map/BluetoothMapContent.java
index 60fd9bb..44a647c 100644
--- a/src/com/android/bluetooth/map/BluetoothMapContent.java
+++ b/src/com/android/bluetooth/map/BluetoothMapContent.java
@@ -36,10 +36,8 @@
import android.text.util.Rfc822Tokenizer;
import android.text.TextUtils;
import android.util.Log;
-import android.util.SparseArray;
import com.android.bluetooth.SignedLongLong;
-import com.android.bluetooth.map.BluetoothMapContentObserver.Msg;
import com.android.bluetooth.map.BluetoothMapUtils.TYPE;
import com.android.bluetooth.map.BluetoothMapbMessageMime.MimePart;
import com.android.bluetooth.mapapi.BluetoothMapContract;
@@ -54,13 +52,10 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
-import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Date;
import java.util.HashMap;
import java.util.List;
-import java.util.concurrent.atomic.AtomicLong;
@TargetApi(19)
public class BluetoothMapContent {
diff --git a/src/com/android/bluetooth/map/BluetoothMapContentObserver.java b/src/com/android/bluetooth/map/BluetoothMapContentObserver.java
index 2a125e7..80e2bef 100644
--- a/src/com/android/bluetooth/map/BluetoothMapContentObserver.java
+++ b/src/com/android/bluetooth/map/BluetoothMapContentObserver.java
@@ -48,10 +48,10 @@
import android.telephony.SmsMessage;
import android.telephony.TelephonyManager;
import android.text.format.DateUtils;
+import android.text.TextUtils;
import android.util.EventLog;
import android.util.Log;
import android.util.Xml;
-import android.text.TextUtils;
import org.xmlpull.v1.XmlSerializer;
diff --git a/src/com/android/bluetooth/map/BluetoothMapConvoContactElement.java b/src/com/android/bluetooth/map/BluetoothMapConvoContactElement.java
index 8ee9728..d141650 100644
--- a/src/com/android/bluetooth/map/BluetoothMapConvoContactElement.java
+++ b/src/com/android/bluetooth/map/BluetoothMapConvoContactElement.java
@@ -24,7 +24,6 @@
import org.xmlpull.v1.XmlPullParserException;
import org.xmlpull.v1.XmlSerializer;
-
import android.util.Log;
import com.android.bluetooth.SignedLongLong;
diff --git a/src/com/android/bluetooth/map/BluetoothMapFolderElement.java b/src/com/android/bluetooth/map/BluetoothMapFolderElement.java
index 8b08fd8..f2c6855 100644
--- a/src/com/android/bluetooth/map/BluetoothMapFolderElement.java
+++ b/src/com/android/bluetooth/map/BluetoothMapFolderElement.java
@@ -14,12 +14,10 @@
*/
package com.android.bluetooth.map;
-
import java.io.IOException;
import java.io.InputStream;
import java.io.StringWriter;
import java.io.UnsupportedEncodingException;
-import java.util.Arrays;
import java.util.HashMap;
import java.util.Locale;
diff --git a/src/com/android/bluetooth/map/BluetoothMapMasInstance.java b/src/com/android/bluetooth/map/BluetoothMapMasInstance.java
index 0dda44b..3d32382 100644
--- a/src/com/android/bluetooth/map/BluetoothMapMasInstance.java
+++ b/src/com/android/bluetooth/map/BluetoothMapMasInstance.java
@@ -31,9 +31,7 @@
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothServerSocket;
import android.bluetooth.BluetoothSocket;
-import android.bluetooth.BluetoothUuid;
import android.content.Context;
import android.content.Intent;
import android.os.Handler;
diff --git a/src/com/android/bluetooth/map/BluetoothMapMessageListing.java b/src/com/android/bluetooth/map/BluetoothMapMessageListing.java
index b904c36..a4bc9e3 100644
--- a/src/com/android/bluetooth/map/BluetoothMapMessageListing.java
+++ b/src/com/android/bluetooth/map/BluetoothMapMessageListing.java
@@ -25,7 +25,6 @@
import org.xmlpull.v1.XmlSerializer;
import android.util.Log;
-import android.util.Xml;
public class BluetoothMapMessageListing {
private boolean hasUnread = false;
diff --git a/src/com/android/bluetooth/map/BluetoothMapMessageListingElement.java b/src/com/android/bluetooth/map/BluetoothMapMessageListingElement.java
index 2d234d5..236d414 100644
--- a/src/com/android/bluetooth/map/BluetoothMapMessageListingElement.java
+++ b/src/com/android/bluetooth/map/BluetoothMapMessageListingElement.java
@@ -15,17 +15,12 @@
package com.android.bluetooth.map;
import java.io.IOException;
-import java.io.StringWriter;
import java.text.SimpleDateFormat;
import java.util.Date;
import org.xmlpull.v1.XmlSerializer;
-import android.telephony.PhoneNumberUtils;
-import android.util.Log;
-import android.util.Xml;
-
import com.android.bluetooth.map.BluetoothMapUtils.TYPE;
public class BluetoothMapMessageListingElement
diff --git a/src/com/android/bluetooth/map/BluetoothMapSettings.java b/src/com/android/bluetooth/map/BluetoothMapSettings.java
index e02552f..101acb1 100644
--- a/src/com/android/bluetooth/map/BluetoothMapSettings.java
+++ b/src/com/android/bluetooth/map/BluetoothMapSettings.java
@@ -14,6 +14,7 @@
*/
package com.android.bluetooth.map;
+
import com.android.bluetooth.R;
import com.android.bluetooth.map.BluetoothMapAccountItem;
@@ -46,7 +47,7 @@
/* update expandable listview with correct items */
- ExpandableListView listView =
+ ExpandableListView listView =
(ExpandableListView) findViewById(R.id.bluetooth_map_settings_list_view);
BluetoothMapSettingsAdapter adapter = new BluetoothMapSettingsAdapter(this,
diff --git a/src/com/android/bluetooth/map/BluetoothMapSettingsAdapter.java b/src/com/android/bluetooth/map/BluetoothMapSettingsAdapter.java
index 2a751f2..bc7db8c 100644
--- a/src/com/android/bluetooth/map/BluetoothMapSettingsAdapter.java
+++ b/src/com/android/bluetooth/map/BluetoothMapSettingsAdapter.java
@@ -16,28 +16,20 @@
package com.android.bluetooth.map;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.LinkedHashMap;
-import java.util.List;
import java.util.Map;
-import com.android.bluetooth.R;
import android.app.Activity;
import android.content.ContentResolver;
import android.content.ContentValues;
-import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.Handler;
-import com.android.bluetooth.mapapi.BluetoothMapContract;
import android.util.Log;
-import android.util.SparseArray;
import android.view.LayoutInflater;
import android.view.View;
-import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.widget.BaseExpandableListAdapter;
import android.widget.CheckBox;
-import android.widget.CheckedTextView;
import android.widget.CompoundButton.OnCheckedChangeListener;
import android.widget.ExpandableListView;
import android.widget.ExpandableListView.OnGroupExpandListener;
@@ -45,8 +37,12 @@
import android.widget.TextView;
import android.widget.Toast;
import android.widget.CompoundButton;
+
+import com.android.bluetooth.R;
+
import com.android.bluetooth.map.BluetoothMapAccountItem;
-import com.android.bluetooth.map.BluetoothMapAccountLoader;
+import com.android.bluetooth.mapapi.BluetoothMapContract;
+
public class BluetoothMapSettingsAdapter extends BaseExpandableListAdapter {
private static final boolean D = BluetoothMapService.DEBUG;
private static final boolean V = BluetoothMapService.VERBOSE;
diff --git a/src/com/android/bluetooth/map/BluetoothMapSmsPdu.java b/src/com/android/bluetooth/map/BluetoothMapSmsPdu.java
index 4428874..d14e7e4 100644
--- a/src/com/android/bluetooth/map/BluetoothMapSmsPdu.java
+++ b/src/com/android/bluetooth/map/BluetoothMapSmsPdu.java
@@ -19,8 +19,6 @@
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.EOFException;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.text.SimpleDateFormat;
@@ -34,14 +32,11 @@
import android.telephony.TelephonyManager;
import android.util.Log;
-import com.android.internal.telephony.*;
-/*import com.android.internal.telephony.GsmAlphabet.TextEncodingDetails;
-import com.android.internal.telephony.SmsConstants;*/
+import com.android.internal.telephony.GsmAlphabet;
+import com.android.internal.telephony.SmsConstants;
import com.android.internal.telephony.SmsHeader;
-import com.android.internal.telephony.SmsMessageBase;
-import com.android.internal.telephony.SmsMessageBase.SubmitPduBase;
-import com.android.internal.telephony.cdma.sms.*;
-import com.android.internal.telephony.gsm.SmsMessage.SubmitPdu;
+import com.android.internal.telephony.cdma.sms.BearerData;
+import com.android.internal.telephony.cdma.sms.UserData;
public class BluetoothMapSmsPdu {
diff --git a/src/com/android/bluetooth/map/BluetoothMapbMessageEmail.java b/src/com/android/bluetooth/map/BluetoothMapbMessageEmail.java
index d329d45..83ec646 100644
--- a/src/com/android/bluetooth/map/BluetoothMapbMessageEmail.java
+++ b/src/com/android/bluetooth/map/BluetoothMapbMessageEmail.java
@@ -15,19 +15,8 @@
package com.android.bluetooth.map;
import java.io.UnsupportedEncodingException;
-import java.nio.charset.Charset;
-import java.text.SimpleDateFormat;
import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.Locale;
-import java.util.UUID;
-import com.android.bluetooth.map.BluetoothMapSmsPdu.SmsPdu;
-
-import android.text.util.Rfc822Token;
-import android.text.util.Rfc822Tokenizer;
-import android.util.Base64;
import android.util.Log;
diff --git a/src/com/android/bluetooth/map/MmsFileProvider.java b/src/com/android/bluetooth/map/MmsFileProvider.java
index 42db92e..c4faaa8 100644
--- a/src/com/android/bluetooth/map/MmsFileProvider.java
+++ b/src/com/android/bluetooth/map/MmsFileProvider.java
@@ -32,7 +32,6 @@
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
-import java.net.URI;
/**
* Provider to let the MMS subsystem read data from it own database from another process.
diff --git a/src/com/android/bluetooth/opp/BluetoothOppBtEnablingActivity.java b/src/com/android/bluetooth/opp/BluetoothOppBtEnablingActivity.java
index 8a07db0..8e12686 100644
--- a/src/com/android/bluetooth/opp/BluetoothOppBtEnablingActivity.java
+++ b/src/com/android/bluetooth/opp/BluetoothOppBtEnablingActivity.java
@@ -33,8 +33,6 @@
package com.android.bluetooth.opp;
import com.android.bluetooth.R;
-import com.android.internal.app.AlertActivity;
-import com.android.internal.app.AlertController;
import android.bluetooth.BluetoothAdapter;
import android.content.BroadcastReceiver;
@@ -49,6 +47,9 @@
import android.view.View;
import android.widget.TextView;
+import com.android.internal.app.AlertActivity;
+import com.android.internal.app.AlertController;
+
/**
* This class is designed to show BT enabling progress.
*/
diff --git a/src/com/android/bluetooth/opp/BluetoothOppLauncherActivity.java b/src/com/android/bluetooth/opp/BluetoothOppLauncherActivity.java
index 39116a0..19b3150 100644
--- a/src/com/android/bluetooth/opp/BluetoothOppLauncherActivity.java
+++ b/src/com/android/bluetooth/opp/BluetoothOppLauncherActivity.java
@@ -39,22 +39,20 @@
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.ArrayList;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.Locale;
import android.app.Activity;
-import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothDevicePicker;
import android.content.Intent;
import android.content.ContentResolver;
import android.content.Context;
import android.net.Uri;
import android.os.Bundle;
-import android.util.Log;
import android.provider.Settings;
-
+import android.util.Log;
import android.util.Patterns;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.Locale;
/**
* This class is designed to act as the entry point of handling the share intent
diff --git a/src/com/android/bluetooth/opp/BluetoothOppNotification.java b/src/com/android/bluetooth/opp/BluetoothOppNotification.java
index 32c8b52..51e8701 100644
--- a/src/com/android/bluetooth/opp/BluetoothOppNotification.java
+++ b/src/com/android/bluetooth/opp/BluetoothOppNotification.java
@@ -45,6 +45,7 @@
import android.os.Handler;
import android.os.Message;
import android.os.Process;
+
import java.util.HashMap;
/**
diff --git a/src/com/android/bluetooth/opp/BluetoothOppProvider.java b/src/com/android/bluetooth/opp/BluetoothOppProvider.java
index cfed7bf..c5b330f 100644
--- a/src/com/android/bluetooth/opp/BluetoothOppProvider.java
+++ b/src/com/android/bluetooth/opp/BluetoothOppProvider.java
@@ -43,13 +43,8 @@
import android.database.sqlite.SQLiteOpenHelper;
import android.database.sqlite.SQLiteQueryBuilder;
import android.net.Uri;
-import android.provider.LiveFolders;
import android.util.Log;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
/**
* This provider allows application to interact with Bluetooth OPP manager
*/
diff --git a/src/com/android/bluetooth/opp/BluetoothOppReceiveFileInfo.java b/src/com/android/bluetooth/opp/BluetoothOppReceiveFileInfo.java
index 89f4299..19564ad 100644
--- a/src/com/android/bluetooth/opp/BluetoothOppReceiveFileInfo.java
+++ b/src/com/android/bluetooth/opp/BluetoothOppReceiveFileInfo.java
@@ -202,7 +202,7 @@
return false;
}
- return true;
+ return true;
} catch (IOException ioe) {
// If an exception is thrown, there might be something wrong with the file.
return false;
diff --git a/src/com/android/bluetooth/opp/BluetoothOppService.java b/src/com/android/bluetooth/opp/BluetoothOppService.java
index a5c8e27..228586b5 100755
--- a/src/com/android/bluetooth/opp/BluetoothOppService.java
+++ b/src/com/android/bluetooth/opp/BluetoothOppService.java
@@ -56,9 +56,7 @@
import android.util.Log;
import android.os.Process;
-import java.io.FileNotFoundException;
import java.io.IOException;
-import java.io.InputStream;
import java.util.ArrayList;
/**
@@ -111,7 +109,6 @@
* Array used when extracting strings from content provider
*/
private CharArrayBuffer mOldChars;
-
/**
* Array used when extracting strings from content provider
*/
diff --git a/src/com/android/bluetooth/opp/BluetoothOppTransfer.java b/src/com/android/bluetooth/opp/BluetoothOppTransfer.java
index e96c536..4cc469e 100755
--- a/src/com/android/bluetooth/opp/BluetoothOppTransfer.java
+++ b/src/com/android/bluetooth/opp/BluetoothOppTransfer.java
@@ -41,18 +41,14 @@
import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothSocket;
import android.bluetooth.BluetoothUuid;
-import android.os.ParcelUuid;
-import android.content.BroadcastReceiver;
import android.content.ContentValues;
import android.content.Context;
import android.content.Intent;
-import android.content.IntentFilter;
import android.net.Uri;
import android.os.Handler;
import android.os.HandlerThread;
import android.os.Looper;
import android.os.Message;
-import android.os.Parcelable;
import android.os.PowerManager;
import android.os.Process;
import android.util.Log;
diff --git a/src/com/android/bluetooth/opp/BluetoothOppTransferHistory.java b/src/com/android/bluetooth/opp/BluetoothOppTransferHistory.java
index 7319b5c..7106f99 100644
--- a/src/com/android/bluetooth/opp/BluetoothOppTransferHistory.java
+++ b/src/com/android/bluetooth/opp/BluetoothOppTransferHistory.java
@@ -44,14 +44,14 @@
import android.os.Bundle;
import android.util.Log;
import android.view.ContextMenu;
+import android.view.ContextMenu.ContextMenuInfo;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
-import android.view.ContextMenu.ContextMenuInfo;
import android.widget.AdapterView;
-import android.widget.ListView;
import android.widget.AdapterView.OnItemClickListener;
+import android.widget.ListView;
/**
* View showing the user's finished bluetooth opp transfers that the user does
diff --git a/src/com/android/bluetooth/opp/BluetoothOppUtility.java b/src/com/android/bluetooth/opp/BluetoothOppUtility.java
index 2c0dafe..b9ff0f3 100644
--- a/src/com/android/bluetooth/opp/BluetoothOppUtility.java
+++ b/src/com/android/bluetooth/opp/BluetoothOppUtility.java
@@ -35,7 +35,6 @@
import com.android.bluetooth.R;
import com.google.android.collect.Lists;
-
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
import android.net.Uri;
diff --git a/src/com/android/bluetooth/pan/BluetoothTetheringNetworkFactory.java b/src/com/android/bluetooth/pan/BluetoothTetheringNetworkFactory.java
index 9437794..b9e372c 100644
--- a/src/com/android/bluetooth/pan/BluetoothTetheringNetworkFactory.java
+++ b/src/com/android/bluetooth/pan/BluetoothTetheringNetworkFactory.java
@@ -26,12 +26,8 @@
import android.net.NetworkFactory;
import android.net.NetworkInfo;
import android.net.NetworkInfo.DetailedState;
-import android.net.NetworkRequest;
import android.net.NetworkUtils;
import android.os.Looper;
-import android.os.Message;
-import android.os.Messenger;
-import android.os.RemoteException;
import android.text.TextUtils;
import android.util.Slog;
diff --git a/src/com/android/bluetooth/pan/PanService.java b/src/com/android/bluetooth/pan/PanService.java
index ea9b97e..6955e4b 100755
--- a/src/com/android/bluetooth/pan/PanService.java
+++ b/src/com/android/bluetooth/pan/PanService.java
@@ -16,15 +16,12 @@
package com.android.bluetooth.pan;
-import android.app.Service;
import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothPan;
import android.bluetooth.BluetoothProfile;
-import android.bluetooth.IBluetooth;
import android.bluetooth.IBluetoothPan;
import android.content.Context;
import android.content.Intent;
-import android.content.pm.PackageManager;
import android.content.res.Resources.NotFoundException;
import android.net.ConnectivityManager;
import android.net.InterfaceConfiguration;
@@ -34,10 +31,8 @@
import android.os.IBinder;
import android.os.INetworkManagementService;
import android.os.Message;
-import android.os.RemoteException;
import android.os.ServiceManager;
import android.os.UserManager;
-import android.provider.Settings;
import android.util.Log;
import com.android.bluetooth.btservice.ProfileService;
@@ -45,10 +40,8 @@
import java.net.InetAddress;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.HashMap;
import java.util.List;
-import java.util.Map;
/**
* Provides Bluetooth Pan Device profile, as a service in
diff --git a/src/com/android/bluetooth/pbap/BluetoothPbapActivity.java b/src/com/android/bluetooth/pbap/BluetoothPbapActivity.java
index 9d98f0d..4a2c67a 100644
--- a/src/com/android/bluetooth/pbap/BluetoothPbapActivity.java
+++ b/src/com/android/bluetooth/pbap/BluetoothPbapActivity.java
@@ -43,17 +43,15 @@
import android.os.Handler;
import android.os.Message;
import android.preference.Preference;
-import android.util.Log;
-import android.view.View;
-import android.widget.CheckBox;
-import android.widget.CompoundButton;
-import android.widget.EditText;
-import android.widget.TextView;
-import android.widget.Button;
-import android.widget.CompoundButton.OnCheckedChangeListener;
import android.text.InputFilter;
import android.text.TextWatcher;
import android.text.InputFilter.LengthFilter;
+import android.util.Log;
+import android.view.View;
+import android.widget.CheckBox;
+import android.widget.EditText;
+import android.widget.TextView;
+import android.widget.Button;
import com.android.internal.app.AlertActivity;
import com.android.internal.app.AlertController;
diff --git a/src/com/android/bluetooth/pbap/BluetoothPbapObexServer.java b/src/com/android/bluetooth/pbap/BluetoothPbapObexServer.java
index 704ad1a..cb499f8 100644
--- a/src/com/android/bluetooth/pbap/BluetoothPbapObexServer.java
+++ b/src/com/android/bluetooth/pbap/BluetoothPbapObexServer.java
@@ -37,8 +37,8 @@
import android.database.Cursor;
import android.os.Message;
import android.os.Handler;
-import android.provider.CallLog.Calls;
import android.provider.CallLog;
+import android.provider.CallLog.Calls;
import android.text.TextUtils;
import android.util.Log;
@@ -52,7 +52,6 @@
import javax.obex.ServerRequestHandler;
import javax.obex.ResponseCodes;
import javax.obex.ApplicationParameter;
-import javax.obex.ServerOperation;
import javax.obex.Operation;
import javax.obex.HeaderSet;
diff --git a/src/com/android/bluetooth/pbap/BluetoothPbapService.java b/src/com/android/bluetooth/pbap/BluetoothPbapService.java
index ae9f673..5e54480 100644
--- a/src/com/android/bluetooth/pbap/BluetoothPbapService.java
+++ b/src/com/android/bluetooth/pbap/BluetoothPbapService.java
@@ -42,17 +42,14 @@
import android.bluetooth.BluetoothProfile;
import android.bluetooth.BluetoothServerSocket;
import android.bluetooth.BluetoothSocket;
-import android.bluetooth.IBluetooth;
-import android.bluetooth.IBluetoothPbap;
import android.bluetooth.BluetoothUuid;
+import android.bluetooth.IBluetoothPbap;
import android.content.Context;
import android.content.Intent;
import android.os.Handler;
import android.os.IBinder;
import android.os.Message;
import android.os.PowerManager;
-import android.os.RemoteException;
-import android.os.ServiceManager;
import android.telephony.TelephonyManager;
import android.text.TextUtils;
import android.util.Log;
@@ -179,8 +176,6 @@
private int mStartId = -1;
- //private IBluetooth mBluetoothService;
-
private boolean mIsWaitingAuthorization = false;
// package and class name to which we send intent to check phone book access permission
diff --git a/src/com/android/bluetooth/pbap/BluetoothPbapUtils.java b/src/com/android/bluetooth/pbap/BluetoothPbapUtils.java
index 89719c4..2696b29 100644
--- a/src/com/android/bluetooth/pbap/BluetoothPbapUtils.java
+++ b/src/com/android/bluetooth/pbap/BluetoothPbapUtils.java
@@ -18,33 +18,23 @@
package com.android.bluetooth.pbap;
import android.content.Context;
-import android.os.SystemProperties;
+import android.content.res.AssetFileDescriptor;
+import android.database.Cursor;
+import android.net.Uri;
+import android.provider.ContactsContract.Profile;
+import android.provider.ContactsContract.RawContactsEntity;
import android.util.Log;
-import com.android.bluetooth.Utils;
-import com.android.bluetooth.pbap.BluetoothPbapService;
import com.android.vcard.VCardComposer;
import com.android.vcard.VCardConfig;
+import com.android.bluetooth.Utils;
+import com.android.bluetooth.pbap.BluetoothPbapService;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
-import android.content.Context;
-import android.content.res.AssetFileDescriptor;
-import android.database.Cursor;
-import android.net.Uri;
-import android.provider.ContactsContract.Contacts;
-import android.provider.ContactsContract.Profile;
-import android.provider.ContactsContract.RawContactsEntity;
-
-
-import com.android.vcard.VCardComposer;
-import com.android.vcard.VCardConfig;
-
-
public class BluetoothPbapUtils {
-
private static final String TAG = "FilterUtils";
private static final boolean V = BluetoothPbapService.VERBOSE;
diff --git a/src/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java b/src/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
index b2118cb..f4b5f10 100644
--- a/src/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
+++ b/src/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
@@ -60,13 +60,11 @@
import java.io.IOException;
import java.io.OutputStream;
import java.util.ArrayList;
-import java.util.Collections;
import javax.obex.ServerOperation;
import javax.obex.Operation;
import javax.obex.ResponseCodes;
-import com.android.bluetooth.Utils;
import com.android.bluetooth.util.DevicePolicyUtils;
public class BluetoothPbapVcardManager {
diff --git a/src/com/android/bluetooth/sap/SapMessage.java b/src/com/android/bluetooth/sap/SapMessage.java
index e836fba..2515c47 100644
--- a/src/com/android/bluetooth/sap/SapMessage.java
+++ b/src/com/android/bluetooth/sap/SapMessage.java
@@ -3,8 +3,6 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.security.InvalidParameterException;
-import java.util.Arrays;
import java.util.Hashtable;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
@@ -13,8 +11,6 @@
import org.android.btsap.SapApi.*;
import com.google.protobuf.micro.*;
-import android.os.Parcel;
-import android.os.Parcelable;
import android.util.Log;
/**
diff --git a/src/com/android/bluetooth/sap/SapRilReceiver.java b/src/com/android/bluetooth/sap/SapRilReceiver.java
index 4bf515a..bd24b4a 100644
--- a/src/com/android/bluetooth/sap/SapRilReceiver.java
+++ b/src/com/android/bluetooth/sap/SapRilReceiver.java
@@ -2,7 +2,6 @@
import java.io.IOException;
import java.io.InputStream;
-import java.io.OutputStream;
import org.android.btsap.SapApi.MsgHeader;
diff --git a/src/com/android/bluetooth/sap/SapServer.java b/src/com/android/bluetooth/sap/SapServer.java
index af8a900..05c7719 100644
--- a/src/com/android/bluetooth/sap/SapServer.java
+++ b/src/com/android/bluetooth/sap/SapServer.java
@@ -1,5 +1,27 @@
package com.android.bluetooth.sap;
+import android.app.AlarmManager;
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.bluetooth.BluetoothSap;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Handler;
+import android.os.Handler.Callback;
+import android.os.HandlerThread;
+import android.os.Looper;
+import android.os.Message;
+import android.os.SystemClock;
+import android.os.SystemProperties;
+import android.telephony.TelephonyManager;
+import android.util.Log;
+
+import com.android.bluetooth.R;
+import com.google.protobuf.micro.CodedOutputStreamMicro;
+
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.IOException;
@@ -7,34 +29,6 @@
import java.io.OutputStream;
import java.util.concurrent.CountDownLatch;
-import com.android.bluetooth.R;
-
-import android.app.AlarmManager;
-import android.app.Notification;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothSocket;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.SyncResult;
-import android.os.Handler;
-import android.os.Handler.Callback;
-import android.os.HandlerThread;
-import android.os.Looper;
-import android.os.Message;
-import android.os.Parcel;
-import android.os.SystemClock;
-import android.os.SystemProperties;
-import android.telephony.TelephonyManager;
-import android.util.Log;
-import android.bluetooth.BluetoothSap;
-
-//import com.android.internal.telephony.RIL;
-import com.google.protobuf.micro.CodedOutputStreamMicro;
-
/**
* The SapServer uses two threads, one for reading messages from the RFCOMM socket and
diff --git a/src/com/android/bluetooth/sap/SapService.java b/src/com/android/bluetooth/sap/SapService.java
index 4aa3f65..f37ecce 100644
--- a/src/com/android/bluetooth/sap/SapService.java
+++ b/src/com/android/bluetooth/sap/SapService.java
@@ -7,19 +7,15 @@
import android.annotation.TargetApi;
import android.app.AlarmManager;
-import android.app.Notification;
-import android.app.NotificationManager;
import android.app.PendingIntent;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothProfile;
+import android.bluetooth.BluetoothSap;
import android.bluetooth.BluetoothServerSocket;
import android.bluetooth.BluetoothSocket;
import android.bluetooth.BluetoothUuid;
-import android.bluetooth.IBluetooth;
import android.bluetooth.IBluetoothSap;
-import android.bluetooth.BluetoothUuid;
-import android.bluetooth.BluetoothSap;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
@@ -32,6 +28,7 @@
import android.provider.Settings;
import android.text.TextUtils;
import android.util.Log;
+
import com.android.bluetooth.R;
import com.android.bluetooth.Utils;
import com.android.bluetooth.btservice.AdapterService;
diff --git a/tests/src/com/android/bluetooth/tests/BluetoothMapContentTest.java b/tests/src/com/android/bluetooth/tests/BluetoothMapContentTest.java
index f94e6c8..ce829e9 100644
--- a/tests/src/com/android/bluetooth/tests/BluetoothMapContentTest.java
+++ b/tests/src/com/android/bluetooth/tests/BluetoothMapContentTest.java
@@ -11,7 +11,6 @@
import java.util.Date;
import java.util.LinkedHashMap;
-import android.annotation.TargetApi;
import android.content.ContentResolver;
import android.content.ContentValues;
import android.content.Context;
diff --git a/tests/src/com/android/bluetooth/tests/BluetoothMapIMContentTest.java b/tests/src/com/android/bluetooth/tests/BluetoothMapIMContentTest.java
index 2d100e4..9de6538 100644
--- a/tests/src/com/android/bluetooth/tests/BluetoothMapIMContentTest.java
+++ b/tests/src/com/android/bluetooth/tests/BluetoothMapIMContentTest.java
@@ -5,7 +5,6 @@
import android.content.Context;
import android.database.Cursor;
import android.net.Uri;
-import android.provider.BaseColumns;
import android.test.AndroidTestCase;
import android.util.Log;
@@ -13,10 +12,6 @@
import java.util.Date;
import com.android.bluetooth.mapapi.BluetoothMapContract;
-import com.android.bluetooth.mapapi.BluetoothMapContract.ConversationColumns;
-
-//import info.guardianproject.otr.app.im.provider.Imps;
-//import info.guardianproject.otr.app.im.provider.ImpsBluetoothProvider;
public class BluetoothMapIMContentTest extends AndroidTestCase {
private static final String TAG = "BluetoothMapIMContentTest";
@@ -168,4 +163,4 @@
mResolver = mContext.getContentResolver();
dumpImConversationTable();
}
-}
\ No newline at end of file
+}
diff --git a/tests/src/com/android/bluetooth/tests/BluetoothMapUtilsTest.java b/tests/src/com/android/bluetooth/tests/BluetoothMapUtilsTest.java
index 788b36f..cef903e 100644
--- a/tests/src/com/android/bluetooth/tests/BluetoothMapUtilsTest.java
+++ b/tests/src/com/android/bluetooth/tests/BluetoothMapUtilsTest.java
@@ -3,11 +3,8 @@
import android.test.AndroidTestCase;
import android.util.Log;
-import android.util.Base64;
import java.io.UnsupportedEncodingException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
import com.android.bluetooth.SignedLongLong;
import com.android.bluetooth.map.BluetoothMapUtils;
diff --git a/tests/src/com/android/bluetooth/tests/BluetoothMapbMessageTest.java b/tests/src/com/android/bluetooth/tests/BluetoothMapbMessageTest.java
index e57d9a4..73a98ef 100755
--- a/tests/src/com/android/bluetooth/tests/BluetoothMapbMessageTest.java
+++ b/tests/src/com/android/bluetooth/tests/BluetoothMapbMessageTest.java
@@ -1,13 +1,5 @@
package com.android.bluetooth.tests;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-
import android.test.AndroidTestCase;
import android.util.Log;
@@ -19,6 +11,15 @@
import com.android.bluetooth.map.BluetoothMapbMessageMime;
import com.android.bluetooth.map.BluetoothMapbMessageSms;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+
+
/***
*
* Test cases for the bMessage class. (encoding and decoding)
diff --git a/tests/src/com/android/bluetooth/tests/MapObexTestServer.java b/tests/src/com/android/bluetooth/tests/MapObexTestServer.java
index 4fb6ba6..4aa04d7 100644
--- a/tests/src/com/android/bluetooth/tests/MapObexTestServer.java
+++ b/tests/src/com/android/bluetooth/tests/MapObexTestServer.java
@@ -8,9 +8,9 @@
import javax.obex.ResponseCodes;
import junit.framework.Assert;
+
import android.bluetooth.BluetoothAdapter;
import android.content.Context;
-import android.os.Handler;
import android.os.RemoteException;
import android.util.Log;
@@ -18,7 +18,6 @@
import com.android.bluetooth.map.BluetoothMapContentObserver;
import com.android.bluetooth.map.BluetoothMapMasInstance;
import com.android.bluetooth.map.BluetoothMapObexServer;
-import com.android.bluetooth.map.BluetoothMapUtils;
import com.android.bluetooth.map.BluetoothMnsObexClient;
public class MapObexTestServer extends BluetoothMapObexServer {
diff --git a/tests/src/com/android/bluetooth/tests/MapStepsConvo.java b/tests/src/com/android/bluetooth/tests/MapStepsConvo.java
index f4288bb..f125ea4 100644
--- a/tests/src/com/android/bluetooth/tests/MapStepsConvo.java
+++ b/tests/src/com/android/bluetooth/tests/MapStepsConvo.java
@@ -3,7 +3,6 @@
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.text.ParseException;
-import java.util.Arrays;
import javax.obex.HeaderSet;
import javax.obex.Operation;
@@ -14,8 +13,6 @@
import com.android.bluetooth.map.BluetoothMapAppParams;
import com.android.bluetooth.map.BluetoothMapConvoListing;
-import com.android.bluetooth.map.BluetoothMapConvoListingElement;
-import com.android.bluetooth.map.BluetoothMapFolderElement;
import com.android.bluetooth.tests.TestSequencer.OPTYPE;
public class MapStepsConvo {
diff --git a/tests/src/com/android/bluetooth/tests/MapTestData.java b/tests/src/com/android/bluetooth/tests/MapTestData.java
index 7cb723b..561b91e 100644
--- a/tests/src/com/android/bluetooth/tests/MapTestData.java
+++ b/tests/src/com/android/bluetooth/tests/MapTestData.java
@@ -19,7 +19,6 @@
import com.android.bluetooth.map.BluetoothMapConvoContactElement;
import com.android.bluetooth.map.BluetoothMapConvoListing;
import com.android.bluetooth.map.BluetoothMapConvoListingElement;
-import com.android.bluetooth.mapapi.BluetoothMapContract;
/**
* Class to hold test data - both the server side data to insert into the databases, and the
diff --git a/tests/src/com/android/bluetooth/tests/ObexPipeTransport.java b/tests/src/com/android/bluetooth/tests/ObexPipeTransport.java
index 28625d5..c63f664 100644
--- a/tests/src/com/android/bluetooth/tests/ObexPipeTransport.java
+++ b/tests/src/com/android/bluetooth/tests/ObexPipeTransport.java
@@ -20,8 +20,6 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.io.PipedInputStream;
-import java.io.PipedOutputStream;
import javax.obex.ObexTransport;
diff --git a/tests/src/com/android/bluetooth/tests/ObexTestDataHandler.java b/tests/src/com/android/bluetooth/tests/ObexTestDataHandler.java
index 9c47971..220698a 100644
--- a/tests/src/com/android/bluetooth/tests/ObexTestDataHandler.java
+++ b/tests/src/com/android/bluetooth/tests/ObexTestDataHandler.java
@@ -1,11 +1,11 @@
package com.android.bluetooth.tests;
+import android.util.Log;
+
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import android.util.Log;
-
public class ObexTestDataHandler {
final String TAG;
diff --git a/tests/src/com/android/bluetooth/tests/ObexTestParams.java b/tests/src/com/android/bluetooth/tests/ObexTestParams.java
index 79a0e14..470bae5 100644
--- a/tests/src/com/android/bluetooth/tests/ObexTestParams.java
+++ b/tests/src/com/android/bluetooth/tests/ObexTestParams.java
@@ -1,9 +1,5 @@
package com.android.bluetooth.tests;
-import javax.obex.ObexTransport;
-
-import android.bluetooth.BluetoothSocket;
-
public class ObexTestParams {
public int packageSize;
diff --git a/tests/src/com/android/bluetooth/tests/SdpManagerTest.java b/tests/src/com/android/bluetooth/tests/SdpManagerTest.java
index 6ff3954..23353eb 100644
--- a/tests/src/com/android/bluetooth/tests/SdpManagerTest.java
+++ b/tests/src/com/android/bluetooth/tests/SdpManagerTest.java
@@ -18,13 +18,10 @@
import android.bluetooth.BluetoothServerSocket;
import android.bluetooth.BluetoothSocket;
import android.bluetooth.BluetoothUuid;
-import android.graphics.Paint.Join;
import android.os.Build;
import android.test.AndroidTestCase;
import android.util.Log;
-import junit.framework.Assert;
-
@TargetApi(Build.VERSION_CODES.KITKAT)
public class SdpManagerTest extends AndroidTestCase {
diff --git a/tests/src/com/android/bluetooth/tests/SdpManagerTestServer.java b/tests/src/com/android/bluetooth/tests/SdpManagerTestServer.java
index 0578390..1ed4afe 100644
--- a/tests/src/com/android/bluetooth/tests/SdpManagerTestServer.java
+++ b/tests/src/com/android/bluetooth/tests/SdpManagerTestServer.java
@@ -1,15 +1,5 @@
package com.android.bluetooth.tests;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.concurrent.CountDownLatch;
-
-import javax.obex.HeaderSet;
-import javax.obex.Operation;
-import javax.obex.ResponseCodes;
-import javax.obex.ServerRequestHandler;
-
-import junit.framework.Assert;
import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothUuid;
import android.bluetooth.SdpMasRecord;
@@ -27,6 +17,17 @@
import com.android.bluetooth.btservice.AbstractionLayer;
import com.android.bluetooth.sdp.SdpManager;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.concurrent.CountDownLatch;
+
+import javax.obex.HeaderSet;
+import javax.obex.Operation;
+import javax.obex.ResponseCodes;
+import javax.obex.ServerRequestHandler;
+
+import junit.framework.Assert;
+
/**
* We use an OBEX server to execute SDP search operations, and validate results.
* @author cbonde
diff --git a/tests/src/com/android/bluetooth/tests/TestSequencer.java b/tests/src/com/android/bluetooth/tests/TestSequencer.java
index fb0dcba..090607f 100644
--- a/tests/src/com/android/bluetooth/tests/TestSequencer.java
+++ b/tests/src/com/android/bluetooth/tests/TestSequencer.java
@@ -13,7 +13,6 @@
import junit.framework.Assert;
import android.content.Context;
-import android.hardware.camera2.impl.GetCommand;
import android.os.Handler;
import android.os.Handler.Callback;
import android.os.HandlerThread;
diff --git a/tests/src/com/android/bluetooth/tests/mock/BluetoothMockContext.java b/tests/src/com/android/bluetooth/tests/mock/BluetoothMockContext.java
index 43f3d46..0241449 100644
--- a/tests/src/com/android/bluetooth/tests/mock/BluetoothMockContext.java
+++ b/tests/src/com/android/bluetooth/tests/mock/BluetoothMockContext.java
@@ -16,7 +16,6 @@
package com.android.bluetooth.tests.mock;
-
import android.content.ContentResolver;
import android.content.Context;
import android.content.res.Resources;
@@ -48,4 +47,4 @@
public Object getSystemService(String name) {
return mOriginalContext.getSystemService(name);
}
-}
\ No newline at end of file
+}
diff --git a/tests/src/com/android/bluetooth/tests/mock/SimpleMockContentProvider.java b/tests/src/com/android/bluetooth/tests/mock/SimpleMockContentProvider.java
index 0c35021..1d358b2 100644
--- a/tests/src/com/android/bluetooth/tests/mock/SimpleMockContentProvider.java
+++ b/tests/src/com/android/bluetooth/tests/mock/SimpleMockContentProvider.java
@@ -16,7 +16,6 @@
package com.android.bluetooth.tests.mock;
-
import android.database.Cursor;
import android.net.Uri;
import android.test.mock.MockContentProvider;
@@ -35,4 +34,4 @@
public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) {
return mResult;
}
-}
\ No newline at end of file
+}
