Remove unused imports

28 files changed, 113 insertions, 118 deletions

diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/encoder/SdlEncoder.java b/android/sdl_android/src/main/java/com/smartdevicelink/encoder/SdlEncoder.java
index 6c9198cb4..0db6521f3 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/encoder/SdlEncoder.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/encoder/SdlEncoder.java
@@ -1,9 +1,5 @@
 package com.smartdevicelink.encoder;
 
-import java.io.IOException;
-import java.io.PipedOutputStream;
-import java.nio.ByteBuffer;
-
 import android.annotation.TargetApi;
 import android.media.MediaCodec;
 import android.media.MediaCodecInfo;
@@ -14,6 +10,10 @@ import android.view.Surface;
 
 import com.smartdevicelink.proxy.interfaces.IVideoStreamListener;
 
+import java.io.IOException;
+import java.io.PipedOutputStream;
+import java.nio.ByteBuffer;
+
 @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR2)
 public class SdlEncoder {
 
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioDecoder.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioDecoder.java
index c80ebba39..ceee8c6e3 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioDecoder.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioDecoder.java
@@ -8,6 +8,7 @@ import android.os.Build;
 import android.support.annotation.NonNull;

 import android.support.annotation.RequiresApi;

 import android.util.Log;

+

 import com.smartdevicelink.managers.audio.AudioStreamManager.SampleType;

 

 import java.nio.ByteBuffer;

diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioStreamManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioStreamManager.java
index 66e8c2b3a..2730a55d0 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioStreamManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioStreamManager.java
@@ -13,7 +13,6 @@ import android.support.annotation.RequiresApi;
 import android.util.Log;

 

 import com.smartdevicelink.SdlConnection.SdlSession;

-import com.smartdevicelink.managers.BaseSubManager;

 import com.smartdevicelink.managers.CompletionListener;

 import com.smartdevicelink.managers.StreamingStateMachine;

 import com.smartdevicelink.protocol.enums.FunctionID;

diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/BaseAudioDecoder.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/BaseAudioDecoder.java
index 22a54a172..7990f0108 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/BaseAudioDecoder.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/BaseAudioDecoder.java
@@ -10,6 +10,7 @@ import android.os.Build;
 import android.support.annotation.NonNull;

 import android.support.annotation.RequiresApi;

 import android.util.Log;

+

 import com.smartdevicelink.managers.audio.AudioStreamManager.SampleType;

 import com.smartdevicelink.proxy.rpc.AudioPassThruCapabilities;

 

diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/SampleBuffer.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/SampleBuffer.java
index 6ae5c6266..b0488439f 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/SampleBuffer.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/SampleBuffer.java
@@ -2,9 +2,10 @@ package com.smartdevicelink.managers.audio;
 

 import android.util.Log;

 

+import com.smartdevicelink.managers.audio.AudioStreamManager.SampleType;

+

 import java.nio.ByteBuffer;

 import java.nio.ByteOrder;

-import com.smartdevicelink.managers.audio.AudioStreamManager.SampleType;

 

 /**

  * Wraps a buffer of raw audio samples depending on the sample type (8 bit, 16 bit)

diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenManager.java
index f74e1a2ac..788914371 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenManager.java
@@ -20,7 +20,6 @@ import com.smartdevicelink.proxy.rpc.enums.LockScreenStatus;
 import com.smartdevicelink.proxy.rpc.enums.RequestType;
 import com.smartdevicelink.proxy.rpc.listeners.OnRPCNotificationListener;
 import com.smartdevicelink.util.AndroidTools;
-import com.smartdevicelink.util.HttpUtils;
 
 import java.io.IOException;
 import java.lang.ref.WeakReference;
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/SDLLockScreenActivity.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/SDLLockScreenActivity.java
index b99cc0d05..04d4660bc 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/SDLLockScreenActivity.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/SDLLockScreenActivity.java
@@ -6,7 +6,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.graphics.Bitmap;
-
 import android.os.Bundle;
 import android.view.Window;
 import android.widget.ImageView;
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlProtocol.java b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlProtocol.java
index da3696443..c06709b52 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlProtocol.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlProtocol.java
@@ -36,7 +36,6 @@ import android.support.annotation.NonNull;
 
 import com.smartdevicelink.protocol.enums.SessionType;
 import com.smartdevicelink.transport.MultiplexTransportConfig;
-
 import com.smartdevicelink.transport.TransportManager;
 
 
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/LockScreenManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/LockScreenManager.java
index d87d6afee..f98b8995b 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/LockScreenManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/LockScreenManager.java
@@ -1,14 +1,13 @@
 package com.smartdevicelink.proxy;

 

-import java.io.IOException;

-

 import android.graphics.Bitmap;

 

 import com.smartdevicelink.proxy.rpc.OnLockScreenStatus;

 import com.smartdevicelink.proxy.rpc.enums.HMILevel;

 import com.smartdevicelink.proxy.rpc.enums.LockScreenStatus;

 import com.smartdevicelink.util.AndroidTools;

-import com.smartdevicelink.util.HttpUtils;

+

+import java.io.IOException;

 

 public class LockScreenManager {

 	

diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCRequestFactory.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCRequestFactory.java
index 7f9986822..48cec50ea 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCRequestFactory.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCRequestFactory.java
@@ -1,7 +1,5 @@
 package com.smartdevicelink.proxy;

 

-import java.util.Vector;

-

 import android.os.Build;

 

 import com.smartdevicelink.proxy.rpc.AddCommand;

@@ -56,6 +54,8 @@ import com.smartdevicelink.proxy.rpc.enums.SamplingRate;
 import com.smartdevicelink.proxy.rpc.enums.TextAlignment;

 import com.smartdevicelink.proxy.rpc.enums.UpdateMode;

 

+import java.util.Vector;

+

 /**

  * @deprecated Use RPC constructors directly instead

  */

diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyALM.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyALM.java
index d49a83e84..884343f1b 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyALM.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyALM.java
@@ -1,13 +1,9 @@
 package com.smartdevicelink.proxy;

 

-import java.util.List;

-import java.util.Vector;

-

 import android.app.Service;

 import android.content.Context;

 

 import com.smartdevicelink.BuildConfig;

-import com.smartdevicelink.proxy.rpc.TemplateColorScheme;

 import com.smartdevicelink.exception.SdlException;

 import com.smartdevicelink.exception.SdlExceptionCause;

 import com.smartdevicelink.proxy.interfaces.IProxyListenerALM;

@@ -19,6 +15,7 @@ import com.smartdevicelink.proxy.rpc.PresetBankCapabilities;
 import com.smartdevicelink.proxy.rpc.SdlMsgVersion;

 import com.smartdevicelink.proxy.rpc.SoftButtonCapabilities;

 import com.smartdevicelink.proxy.rpc.TTSChunk;

+import com.smartdevicelink.proxy.rpc.TemplateColorScheme;

 import com.smartdevicelink.proxy.rpc.VehicleType;

 import com.smartdevicelink.proxy.rpc.enums.AppHMIType;

 import com.smartdevicelink.proxy.rpc.enums.HmiZoneCapabilities;

@@ -34,6 +31,9 @@ import com.smartdevicelink.transport.BaseTransportConfig;
 import com.smartdevicelink.transport.MultiplexTransportConfig;

 import com.smartdevicelink.transport.enums.TransportType;

 

+import java.util.List;

+import java.util.Vector;

+

 import static com.smartdevicelink.proxy.SystemCapabilityManager.convertToList;

 

 

diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBuilder.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBuilder.java
index 42e2fbbc2..753a179c8 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBuilder.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBuilder.java
@@ -1,7 +1,7 @@
 package com.smartdevicelink.proxy;
 
-import java.util.List;
-import java.util.Vector;
+import android.app.Service;
+import android.content.Context;
 
 import com.smartdevicelink.exception.SdlException;
 import com.smartdevicelink.proxy.interfaces.IProxyListenerALM;
@@ -15,8 +15,8 @@ import com.smartdevicelink.transport.BTTransportConfig;
 import com.smartdevicelink.transport.BaseTransportConfig;
 import com.smartdevicelink.transport.MultiplexTransportConfig;
 
-import android.app.Service;
-import android.content.Context;
+import java.util.List;
+import java.util.Vector;
 
 public class SdlProxyBuilder {
     // Required parameters
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/streaming/StreamPacketizer.java b/android/sdl_android/src/main/java/com/smartdevicelink/streaming/StreamPacketizer.java
index bd51768ea..a5621ef7e 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/streaming/StreamPacketizer.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/streaming/StreamPacketizer.java
@@ -1,11 +1,5 @@
 package com.smartdevicelink.streaming;

 

-import java.io.IOException;

-import java.io.InputStream;

-import java.nio.ByteBuffer;

-import java.util.concurrent.BlockingQueue;

-import java.util.concurrent.LinkedBlockingQueue;

-

 import com.smartdevicelink.SdlConnection.SdlConnection;

 import com.smartdevicelink.SdlConnection.SdlSession;

 import com.smartdevicelink.protocol.ProtocolMessage;

@@ -13,6 +7,12 @@ import com.smartdevicelink.protocol.enums.SessionType;
 import com.smartdevicelink.proxy.interfaces.IAudioStreamListener;

 import com.smartdevicelink.proxy.interfaces.IVideoStreamListener;

 

+import java.io.IOException;

+import java.io.InputStream;

+import java.nio.ByteBuffer;

+import java.util.concurrent.BlockingQueue;

+import java.util.concurrent.LinkedBlockingQueue;

+

 public class StreamPacketizer extends AbstractPacketizer implements IVideoStreamListener, IAudioStreamListener, Runnable{

 

 	public final static String TAG = "StreamPacketizer";

diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/streaming/StreamRPCPacketizer.java b/android/sdl_android/src/main/java/com/smartdevicelink/streaming/StreamRPCPacketizer.java
index 8aab788c9..6ab86c292 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/streaming/StreamRPCPacketizer.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/streaming/StreamRPCPacketizer.java
@@ -1,11 +1,6 @@
 package com.smartdevicelink.streaming;

 

-import java.io.IOException;

-import java.io.InputStream;

-import java.util.Hashtable;

-

 import com.smartdevicelink.SdlConnection.SdlSession;

-

 import com.smartdevicelink.marshal.JsonRPCMarshaller;

 import com.smartdevicelink.protocol.ProtocolMessage;

 import com.smartdevicelink.protocol.enums.FunctionID;

@@ -24,6 +19,10 @@ import com.smartdevicelink.proxy.rpc.enums.Result;
 import com.smartdevicelink.proxy.rpc.listeners.OnPutFileUpdateListener;

 import com.smartdevicelink.util.Version;

 

+import java.io.IOException;

+import java.io.InputStream;

+import java.util.Hashtable;

+

 public class StreamRPCPacketizer extends AbstractPacketizer implements IPutFileResponseListener, Runnable{

 

 	private Integer iInitialCorrID = 0;

diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/trace/SdlTrace.java b/android/sdl_android/src/main/java/com/smartdevicelink/trace/SdlTrace.java
index 2d997b1c4..d72a0f0d6 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/trace/SdlTrace.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/trace/SdlTrace.java
@@ -1,7 +1,5 @@
 package com.smartdevicelink.trace;

 

-import java.sql.Timestamp;

-

 import android.annotation.SuppressLint;

 import android.bluetooth.BluetoothDevice;

 import android.os.Build;

@@ -23,6 +21,8 @@ import com.smartdevicelink.util.BitConverter;
 import com.smartdevicelink.util.DebugTool;

 import com.smartdevicelink.util.NativeLogTool;

 

+import java.sql.Timestamp;

+

 /* This class handles the global TraceSettings as requested by the users either through the combination of the following

    1. System defaults

    2. Application XML config

diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/trace/TraceDeviceInfo.java b/android/sdl_android/src/main/java/com/smartdevicelink/trace/TraceDeviceInfo.java
index 83c612d76..80b8c482d 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/trace/TraceDeviceInfo.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/trace/TraceDeviceInfo.java
@@ -3,15 +3,15 @@
  */

 package com.smartdevicelink.trace;

 

-import java.util.Iterator;

-import java.util.Set;

-

-import com.smartdevicelink.util.DebugTool;

-

 import android.bluetooth.BluetoothAdapter;

 import android.bluetooth.BluetoothDevice;

 import android.telephony.TelephonyManager;

 

+import com.smartdevicelink.util.DebugTool;

+

+import java.util.Iterator;

+import java.util.Set;

+

 /**

  * @author vvolkman

  * 

diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/BTTransport.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/BTTransport.java
index 74ca18478..37cf0b7e7 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/BTTransport.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/BTTransport.java
@@ -1,11 +1,5 @@
 package com.smartdevicelink.transport;

 

-import java.io.IOException;

-import java.io.InputStream;

-import java.io.OutputStream;

-import java.lang.reflect.Field;

-import java.util.UUID;

-

 import android.bluetooth.BluetoothAdapter;

 import android.bluetooth.BluetoothDevice;

 import android.bluetooth.BluetoothServerSocket;

@@ -22,6 +16,12 @@ import com.smartdevicelink.trace.enums.InterfaceActivityDirection;
 import com.smartdevicelink.transport.enums.TransportType;

 import com.smartdevicelink.util.DebugTool;

 

+import java.io.IOException;

+import java.io.InputStream;

+import java.io.OutputStream;

+import java.lang.reflect.Field;

+import java.util.UUID;

+

 /**

  * Bluetooth Transport Implementation. This transport advertises its existence to SDL by publishing an SDP record and waiting for an incoming connection from SDL. Connection is verified by checking for the SDL UUID. For more detailed information please refer to the <a href="#bluetoothTransport">Bluetooth Transport Guide</a>.

  *

diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBluetoothTransport.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBluetoothTransport.java
index dd66784f7..058fb0d7e 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBluetoothTransport.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBluetoothTransport.java
@@ -19,14 +19,6 @@
 
 package com.smartdevicelink.transport;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.UUID;
-
 import android.annotation.SuppressLint;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
@@ -42,6 +34,14 @@ import com.smartdevicelink.protocol.SdlPacket;
 import com.smartdevicelink.transport.enums.TransportType;
 import com.smartdevicelink.transport.utl.TransportRecord;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.UUID;
+
 /**
  * This class does all the work for setting up and managing Bluetooth
  * connections with other devices. It has a thread that listens for
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexTransportConfig.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexTransportConfig.java
index 8a3e39d20..65989307e 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexTransportConfig.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexTransportConfig.java
@@ -32,12 +32,12 @@
 
 package com.smartdevicelink.transport;
 
-import com.smartdevicelink.transport.enums.TransportType;
-import com.smartdevicelink.transport.utl.TransportRecord;
-
 import android.content.ComponentName;
 import android.content.Context;
 
+import com.smartdevicelink.transport.enums.TransportType;
+import com.smartdevicelink.transport.utl.TransportRecord;
+
 import java.util.Arrays;
 import java.util.List;
 
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/RouterServiceValidator.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/RouterServiceValidator.java
index 868c71054..3c3068ce2 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/RouterServiceValidator.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/RouterServiceValidator.java
@@ -1,15 +1,5 @@
 package com.smartdevicelink.transport;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Locale;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import android.app.ActivityManager;
 import android.app.ActivityManager.RunningServiceInfo;
 import android.bluetooth.BluetoothAdapter;
@@ -30,6 +20,16 @@ import com.smartdevicelink.util.AndroidTools;
 import com.smartdevicelink.util.HttpRequestTask;
 import com.smartdevicelink.util.HttpRequestTask.HttpRequestTaskCallback;
 
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Locale;
+
 /**
  * This class will tell us if the currently running router service is valid or not.
  * To use this class simply create a new instance of RouterServiceValidator with a supplied context.
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java
index e0f71a121..05fa8353f 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java
@@ -32,32 +32,7 @@
 
 package com.smartdevicelink.transport;
 
-import static com.smartdevicelink.transport.TransportConstants.CONNECTED_DEVICE_STRING_EXTRA_NAME;
-import static com.smartdevicelink.transport.TransportConstants.FORMED_PACKET_EXTRA_NAME;
-import static com.smartdevicelink.transport.TransportConstants.HARDWARE_DISCONNECTED;
-import static com.smartdevicelink.transport.TransportConstants.SEND_PACKET_TO_APP_LOCATION_EXTRA_NAME;
-
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Set;
-import java.util.Vector;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import android.Manifest;
-
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.app.ActivityManager;
@@ -120,9 +95,32 @@ import com.smartdevicelink.util.BitConverter;
 import com.smartdevicelink.util.DebugTool;
 import com.smartdevicelink.util.SdlAppInfo;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Set;
+import java.util.Vector;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+import static com.smartdevicelink.transport.TransportConstants.CONNECTED_DEVICE_STRING_EXTRA_NAME;
 import static com.smartdevicelink.transport.TransportConstants.FOREGROUND_EXTRA;
+import static com.smartdevicelink.transport.TransportConstants.FORMED_PACKET_EXTRA_NAME;
+import static com.smartdevicelink.transport.TransportConstants.HARDWARE_DISCONNECTED;
 import static com.smartdevicelink.transport.TransportConstants.SDL_NOTIFICATION_CHANNEL_ID;
 import static com.smartdevicelink.transport.TransportConstants.SDL_NOTIFICATION_CHANNEL_NAME;
+import static com.smartdevicelink.transport.TransportConstants.SEND_PACKET_TO_APP_LOCATION_EXTRA_NAME;
 import static com.smartdevicelink.transport.TransportConstants.TRANSPORT_DISCONNECTED;
 
 /**
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/TCPTransport.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/TCPTransport.java
index c858c7790..4e5bfe517 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/TCPTransport.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/TCPTransport.java
@@ -1,11 +1,5 @@
 package com.smartdevicelink.transport;

 

-import java.io.IOException;

-import java.io.InputStream;

-import java.io.OutputStream;

-import java.net.InetSocketAddress;

-import java.net.Socket;

-

 import android.annotation.TargetApi;

 import android.os.Build;

 import android.os.NetworkOnMainThreadException;

@@ -16,6 +10,12 @@ import com.smartdevicelink.exception.SdlExceptionCause;
 import com.smartdevicelink.protocol.SdlPacket;

 import com.smartdevicelink.transport.enums.TransportType;

 

+import java.io.IOException;

+import java.io.InputStream;

+import java.io.OutputStream;

+import java.net.InetSocketAddress;

+import java.net.Socket;

+

 /**

  * General comments:

  *

diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/USBTransport.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/USBTransport.java
index 9b1bf1efd..d2d488e30 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/USBTransport.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/USBTransport.java
@@ -1,11 +1,5 @@
 package com.smartdevicelink.transport;

 

-import java.io.FileDescriptor;

-import java.io.FileInputStream;

-import java.io.FileOutputStream;

-import java.io.IOException;

-import java.io.InputStream;

-import java.io.OutputStream;

 import android.annotation.SuppressLint;

 import android.app.PendingIntent;

 import android.content.BroadcastReceiver;

@@ -15,6 +9,7 @@ import android.content.IntentFilter;
 import android.hardware.usb.UsbAccessory;

 import android.hardware.usb.UsbManager;

 import android.os.ParcelFileDescriptor;

+

 import com.smartdevicelink.exception.SdlException;

 import com.smartdevicelink.exception.SdlExceptionCause;

 import com.smartdevicelink.protocol.SdlPacket;

@@ -23,6 +18,13 @@ import com.smartdevicelink.trace.enums.InterfaceActivityDirection;
 import com.smartdevicelink.transport.enums.TransportType;

 import com.smartdevicelink.util.DebugTool;

 

+import java.io.FileDescriptor;

+import java.io.FileInputStream;

+import java.io.FileOutputStream;

+import java.io.IOException;

+import java.io.InputStream;

+import java.io.OutputStream;

+

 /**

  * Class that implements USB transport.

  *

diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/USBTransportConfig.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/USBTransportConfig.java
index b819a6844..fd6ae7cfa 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/USBTransportConfig.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/USBTransportConfig.java
@@ -1,10 +1,10 @@
 package com.smartdevicelink.transport;

 

-import com.smartdevicelink.transport.enums.TransportType;

-

 import android.content.Context;

 import android.hardware.usb.UsbAccessory;

 

+import com.smartdevicelink.transport.enums.TransportType;

+

 /**

  * <b>NOTE: </b> This should no longer be used. See the MultplexTransportConfig and guides to

  * understand how to implement USB multiplexing. This class and method of USB connection will be

diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/UsbTransferProvider.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/UsbTransferProvider.java
index 1479fa9e1..6fb17172a 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/UsbTransferProvider.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/UsbTransferProvider.java
@@ -40,7 +40,6 @@ import android.content.Intent;
 import android.content.ServiceConnection;
 import android.hardware.usb.UsbAccessory;
 import android.hardware.usb.UsbManager;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/ByteAraryMessageAssembler.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/ByteAraryMessageAssembler.java
index 61fd2e13e..84a708174 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/ByteAraryMessageAssembler.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/ByteAraryMessageAssembler.java
@@ -1,13 +1,13 @@
 package com.smartdevicelink.transport.utl;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
 import android.util.Log;
 
 import com.smartdevicelink.transport.TransportConstants;
 import com.smartdevicelink.transport.enums.TransportType;
 
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
 public class ByteAraryMessageAssembler {
 	private static final String TAG = "ByteAraryMessageAssembler";
 	ByteArrayOutputStream buffer;
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/ByteArrayMessageSpliter.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/ByteArrayMessageSpliter.java
index 999fdacb3..690333eb9 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/ByteArrayMessageSpliter.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/ByteArrayMessageSpliter.java
@@ -1,15 +1,14 @@
 package com.smartdevicelink.transport.utl;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
+import android.os.Bundle;
+import android.os.Message;
+import android.util.Log;
 
 import com.smartdevicelink.transport.TransportBroker;
 import com.smartdevicelink.transport.TransportConstants;
-import com.smartdevicelink.transport.enums.TransportType;
 
-import android.os.Bundle;
-import android.os.Message;
-import android.util.Log;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
 
 public class ByteArrayMessageSpliter {
 	private static final String TAG = "ByteArrayMessageSpliter";
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/util/HttpUtils.java b/android/sdl_android/src/main/java/com/smartdevicelink/util/HttpUtils.java
index 8e26d8119..5179d7910 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/util/HttpUtils.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/util/HttpUtils.java
@@ -1,9 +1,9 @@
 package com.smartdevicelink.util;
 
-import java.io.IOException;
-
 import android.graphics.Bitmap;
 
+import java.io.IOException;
+
 /**
  * @see AndroidTools
  */