Remove more unused imports

25 files changed, 18 insertions, 81 deletions

diff --git a/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/ISdlConnectionListener.java b/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/ISdlConnectionListener.java
index 5035f5547..8c9032d7b 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/ISdlConnectionListener.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/ISdlConnectionListener.java
@@ -3,11 +3,8 @@ package com.smartdevicelink.SdlConnection;
 import com.smartdevicelink.protocol.ProtocolMessage;

 import com.smartdevicelink.protocol.enums.SessionType;

 import com.smartdevicelink.transport.MultiplexTransportConfig;

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

 

-import java.util.ArrayList;

 import java.util.List;

-import java.util.Map;

 

 

 public interface ISdlConnectionListener {

diff --git a/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/SdlConnection.java b/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/SdlConnection.java
index 19b60abe2..1d7055045 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/SdlConnection.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/SdlConnection.java
@@ -1,12 +1,7 @@
 package com.smartdevicelink.SdlConnection;

 

 

-import java.util.List;

-import java.util.Map;

-import java.util.concurrent.CopyOnWriteArrayList;

-

 import android.content.ComponentName;

-import android.os.Bundle;

 import android.util.Log;

 

 import com.smartdevicelink.exception.SdlException;

@@ -31,6 +26,9 @@ import com.smartdevicelink.transport.USBTransport;
 import com.smartdevicelink.transport.USBTransportConfig;

 import com.smartdevicelink.transport.enums.TransportType;

 

+import java.util.List;

+import java.util.concurrent.CopyOnWriteArrayList;

+

 @Deprecated

 public class SdlConnection implements IProtocolListener, ITransportListener {

 

diff --git a/sdl_android/src/main/java/com/smartdevicelink/managers/screen/ScreenManager.java b/sdl_android/src/main/java/com/smartdevicelink/managers/screen/ScreenManager.java
index d24cd7e93..44347f43b 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/managers/screen/ScreenManager.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/managers/screen/ScreenManager.java
@@ -8,9 +8,7 @@ import com.smartdevicelink.managers.CompletionListener;
 import com.smartdevicelink.managers.file.FileManager;
 import com.smartdevicelink.managers.file.filetypes.SdlArtwork;
 import com.smartdevicelink.proxy.interfaces.ISdl;
-import com.smartdevicelink.proxy.rpc.SetDisplayLayout;
 import com.smartdevicelink.proxy.rpc.enums.MetadataType;
-import com.smartdevicelink.proxy.rpc.enums.PredefinedLayout;
 import com.smartdevicelink.proxy.rpc.enums.TextAlignment;
 import com.smartdevicelink.util.DebugTool;
 
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCStruct.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCStruct.java
index f23fac781..433c20553 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCStruct.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCStruct.java
@@ -1,7 +1,5 @@
 package com.smartdevicelink.proxy;

 

-import android.util.Log;

-

 import com.smartdevicelink.marshal.JsonRPCMarshaller;

 import com.smartdevicelink.util.Version;

 

diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AirbagStatus.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AirbagStatus.java
index a1ef8aa88..06542c942 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AirbagStatus.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AirbagStatus.java
@@ -7,9 +7,6 @@ import java.util.Hashtable;
 import com.smartdevicelink.proxy.RPCStruct;

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

 

-import static com.smartdevicelink.proxy.constants.Names.driverCurtainAirbagDeployed;

-import static com.smartdevicelink.proxy.constants.Names.driverSideAirbagDeployed;

-

 /**

  * <p>The status of the air bags.</p>

  *

diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AudioPassThruCapabilities.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AudioPassThruCapabilities.java
index 7252eeb83..675ddbbfc 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AudioPassThruCapabilities.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/AudioPassThruCapabilities.java
@@ -6,12 +6,9 @@ import com.smartdevicelink.proxy.RPCStruct;
 import com.smartdevicelink.proxy.rpc.enums.AudioType;

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

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

-import com.smartdevicelink.proxy.rpc.enums.VehicleDataEventStatus;

 

 import java.util.Hashtable;

 

-import static com.smartdevicelink.proxy.rpc.AirbagStatus.KEY_DRIVER_CURTAIN_AIRBAG_DEPLOYED;

-

 /**

  *<p> Describes different audio type configurations for PerformAudioPassThru, e.g. {8kHz,8-bit,PCM}

  * Specifies the capabilities of audio capturing: sampling rate, bits per sample, audio type.</p>

diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/BeltStatus.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/BeltStatus.java
index 440343354..65a7e674e 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/BeltStatus.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/BeltStatus.java
@@ -2,13 +2,10 @@ package com.smartdevicelink.proxy.rpc;
 

 import android.support.annotation.NonNull;

 

-import java.util.Hashtable;

-

 import com.smartdevicelink.proxy.RPCStruct;

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

 

-import static com.smartdevicelink.proxy.rpc.AirbagStatus.KEY_DRIVER_AIRBAG_DEPLOYED;

-import static com.smartdevicelink.proxy.rpc.AirbagStatus.KEY_DRIVER_CURTAIN_AIRBAG_DEPLOYED;

+import java.util.Hashtable;

 

 /** The status of the seat belts.

  *

diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/BodyInformation.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/BodyInformation.java
index 7773aaaa7..b2f4cd2f3 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/BodyInformation.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/BodyInformation.java
@@ -5,12 +5,9 @@ import android.support.annotation.NonNull;
 import com.smartdevicelink.proxy.RPCStruct;

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

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

-import com.smartdevicelink.proxy.rpc.enums.VehicleDataEventStatus;

 

 import java.util.Hashtable;

 

-import static com.smartdevicelink.proxy.rpc.AirbagStatus.KEY_DRIVER_CURTAIN_AIRBAG_DEPLOYED;

-

 /** The body information including power modes.

  * 

  * <p><b>Note:</b> The structure defines the information about the park brake and ignition.</p>

diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DisplayCapabilities.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DisplayCapabilities.java
index e97a3d449..c8c761440 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DisplayCapabilities.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/DisplayCapabilities.java
@@ -5,15 +5,10 @@ import android.support.annotation.NonNull;
 import com.smartdevicelink.proxy.RPCStruct;

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

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

-import com.smartdevicelink.proxy.rpc.enums.VehicleDataResultCode;

-import com.smartdevicelink.util.DebugTool;

 

-import java.util.ArrayList;

 import java.util.Hashtable;

 import java.util.List;

 

-import static com.smartdevicelink.proxy.constants.Names.displayType;

-

 /**

  * Contains information about the display for the SDL system to which the application is currently connected.

  * <p><b> Parameter List</b></p>

diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ECallInfo.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ECallInfo.java
index b62620026..93a973aab 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ECallInfo.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ECallInfo.java
@@ -4,9 +4,7 @@ import android.support.annotation.NonNull;
 

 import com.smartdevicelink.proxy.RPCStruct;

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

-import com.smartdevicelink.proxy.rpc.enums.VehicleDataEventStatus;

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

-import com.smartdevicelink.proxy.rpc.enums.VehicleDataResultCode;

 

 import java.util.Hashtable;

 

diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ImageField.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ImageField.java
index 0dccc55cc..6114f28c0 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ImageField.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ImageField.java
@@ -3,17 +3,12 @@ package com.smartdevicelink.proxy.rpc;
 import android.support.annotation.NonNull;

 

 import com.smartdevicelink.proxy.RPCStruct;

-import com.smartdevicelink.proxy.rpc.enums.AmbientLightStatus;

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

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

-import com.smartdevicelink.util.DebugTool;

 

-import java.util.ArrayList;

 import java.util.Hashtable;

 import java.util.List;

 

-import static com.smartdevicelink.proxy.rpc.HeadLampStatus.KEY_AMBIENT_LIGHT_SENSOR_STATUS;

-

 /** <p>The name that identifies the field.For example AppIcon,SoftButton, LocationImage, etc.</p>

  * 

  * <p><b>Parameter List</b></p>

diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java
index 42bf02305..526f8dbb7 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java
@@ -1,8 +1,5 @@
 package com.smartdevicelink.proxy.rpc;

 

-import java.util.Hashtable;

-import java.util.List;

-

 import com.smartdevicelink.protocol.enums.FunctionID;

 import com.smartdevicelink.proxy.RPCNotification;

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

@@ -11,10 +8,10 @@ import com.smartdevicelink.proxy.rpc.enums.PRNDL;
 import com.smartdevicelink.proxy.rpc.enums.TurnSignal;

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

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

-import com.smartdevicelink.util.DebugTool;

 import com.smartdevicelink.util.SdlDataTypeConverter;

 

-import static com.smartdevicelink.proxy.constants.Names.timeout;

+import java.util.Hashtable;

+import java.util.List;

 

 /**

  *Individual requested DID result and data.

diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PermissionItem.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PermissionItem.java
index aad3af8eb..24695a872 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PermissionItem.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/PermissionItem.java
@@ -3,11 +3,9 @@ package com.smartdevicelink.proxy.rpc;
 

 import android.support.annotation.NonNull;

 

-import java.util.Hashtable;

-

 import com.smartdevicelink.proxy.RPCStruct;

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

-import com.smartdevicelink.util.DebugTool;

+

+import java.util.Hashtable;

 /**

  * Change in permissions for a given set of RPCs

  * 

diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ScrollableMessage.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ScrollableMessage.java
index 8f249ffe0..2ee1230f7 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ScrollableMessage.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/ScrollableMessage.java
@@ -4,9 +4,7 @@ import android.support.annotation.NonNull;
 

 import com.smartdevicelink.protocol.enums.FunctionID;

 import com.smartdevicelink.proxy.RPCRequest;

-import com.smartdevicelink.proxy.rpc.enums.Language;

 

-import java.util.ArrayList;

 import java.util.Hashtable;

 import java.util.List;

 

diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SoftButton.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SoftButton.java
index 751729220..cd4517dcd 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SoftButton.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/SoftButton.java
@@ -2,12 +2,11 @@ package com.smartdevicelink.proxy.rpc;
 

 import android.support.annotation.NonNull;

 

-import java.util.Hashtable;

-

 import com.smartdevicelink.proxy.RPCStruct;

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

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

-import com.smartdevicelink.util.DebugTool;

+

+import java.util.Hashtable;

 /**

  * <p> A simulated button or keyboard key that is displayed on a touch screen.</p>

  *

diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TextField.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TextField.java
index 7f745186b..23e5c148f 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TextField.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TextField.java
@@ -2,13 +2,11 @@ package com.smartdevicelink.proxy.rpc;
 

 import android.support.annotation.NonNull;

 

-import java.util.Hashtable;

-

 import com.smartdevicelink.proxy.RPCStruct;

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

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

 

-import static com.smartdevicelink.proxy.rpc.TireStatus.KEY_INNER_RIGHT_REAR;

+import java.util.Hashtable;

 

 /**

  * Struct defining the characteristics of a displayed field on the HMI.

diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TireStatus.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TireStatus.java
index 4a5e95625..15028cc9e 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TireStatus.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/TireStatus.java
@@ -3,14 +3,10 @@ package com.smartdevicelink.proxy.rpc;
 import android.support.annotation.NonNull;

 

 import com.smartdevicelink.proxy.RPCStruct;

-import com.smartdevicelink.proxy.rpc.enums.VehicleDataNotificationStatus;

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

-import com.smartdevicelink.util.DebugTool;

 

 import java.util.Hashtable;

 

-import static com.smartdevicelink.proxy.rpc.ECallInfo.KEY_E_CALL_NOTIFICATION_STATUS;

-

 /** <p>The status and pressure of the tires.</p>

  *   <p><b> Parameter List:</b></p>

  *   

diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Turn.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Turn.java
index 6cebac7f1..323974019 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Turn.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/Turn.java
@@ -1,7 +1,6 @@
 package com.smartdevicelink.proxy.rpc;
 
 import com.smartdevicelink.proxy.RPCStruct;
-import com.smartdevicelink.proxy.rpc.enums.VehicleDataResultCode;
 
 import java.util.Hashtable;
 
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VrHelpItem.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VrHelpItem.java
index 10eb6b0be..39fb08b8b 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VrHelpItem.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/VrHelpItem.java
@@ -2,10 +2,9 @@ package com.smartdevicelink.proxy.rpc;
 

 import android.support.annotation.NonNull;

 

-import java.util.Hashtable;

-

 import com.smartdevicelink.proxy.RPCStruct;

-import com.smartdevicelink.util.DebugTool;

+

+import java.util.Hashtable;

 /**

  * 

  * VR help items  i.e. the text strings to be displayed, and when pronounced by the user the recognition of any of which must trigger the corresponding VR command.

diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnMultipleRequestListener.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnMultipleRequestListener.java
index 88f119bdd..a8e9f31b8 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnMultipleRequestListener.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/rpc/listeners/OnMultipleRequestListener.java
@@ -1,7 +1,5 @@
 package com.smartdevicelink.proxy.rpc.listeners;
 
-import android.util.Log;
-
 import com.smartdevicelink.proxy.RPCResponse;
 import com.smartdevicelink.proxy.rpc.enums.Result;
 
diff --git a/sdl_android/src/main/java/com/smartdevicelink/streaming/StreamPacketizer.java b/sdl_android/src/main/java/com/smartdevicelink/streaming/StreamPacketizer.java
index 24f8eb926..bd51768ea 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/streaming/StreamPacketizer.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/streaming/StreamPacketizer.java
@@ -8,9 +8,7 @@ import java.util.concurrent.LinkedBlockingQueue;
 

 import com.smartdevicelink.SdlConnection.SdlConnection;

 import com.smartdevicelink.SdlConnection.SdlSession;

-import com.smartdevicelink.protocol.AbstractProtocol;

 import com.smartdevicelink.protocol.ProtocolMessage;

-import com.smartdevicelink.protocol.WiProProtocol;

 import com.smartdevicelink.protocol.enums.SessionType;

 import com.smartdevicelink.proxy.interfaces.IAudioStreamListener;

 import com.smartdevicelink.proxy.interfaces.IVideoStreamListener;

diff --git a/sdl_android/src/main/java/com/smartdevicelink/streaming/video/RTPH264Packetizer.java b/sdl_android/src/main/java/com/smartdevicelink/streaming/video/RTPH264Packetizer.java
index 1e2b9c5da..b35fd61c4 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/streaming/video/RTPH264Packetizer.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/streaming/video/RTPH264Packetizer.java
@@ -37,13 +37,10 @@ import java.util.Random;
 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;
 import com.smartdevicelink.protocol.enums.SessionType;
 import com.smartdevicelink.proxy.interfaces.IVideoStreamListener;
-import com.smartdevicelink.proxy.rpc.enums.VideoStreamingCodec;
-import com.smartdevicelink.proxy.rpc.enums.VideoStreamingProtocol;
 import com.smartdevicelink.streaming.AbstractPacketizer;
 import com.smartdevicelink.streaming.IStreamListener;
 
diff --git a/sdl_android/src/main/java/com/smartdevicelink/transport/SdlBroadcastReceiver.java b/sdl_android/src/main/java/com/smartdevicelink/transport/SdlBroadcastReceiver.java
index b96ac4f65..aef43dd80 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/transport/SdlBroadcastReceiver.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/transport/SdlBroadcastReceiver.java
@@ -32,7 +32,6 @@
 
 package com.smartdevicelink.transport;
 
-import android.annotation.TargetApi;
 import android.app.ActivityManager;
 import android.app.ActivityManager.RunningServiceInfo;
 import android.bluetooth.BluetoothAdapter;
diff --git a/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterStatusProvider.java b/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterStatusProvider.java
index 2b3a17a8e..734a16b58 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterStatusProvider.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterStatusProvider.java
@@ -1,25 +1,21 @@
 package com.smartdevicelink.transport;
 
-import java.lang.ref.WeakReference;
-
-import com.smartdevicelink.util.AndroidTools;
-
-import android.annotation.SuppressLint;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
-import android.content.pm.PackageManager;
-import android.content.pm.ServiceInfo;
-import android.content.pm.PackageManager.NameNotFoundException;
 import android.os.Build;
 import android.os.Handler;
 import android.os.IBinder;
+import android.os.Looper;
 import android.os.Message;
 import android.os.Messenger;
 import android.os.RemoteException;
 import android.util.Log;
-import android.os.Looper;
+
+import com.smartdevicelink.util.AndroidTools;
+
+import java.lang.ref.WeakReference;
 
 import static com.smartdevicelink.transport.TransportConstants.FOREGROUND_EXTRA;
 
diff --git a/sdl_android/src/main/java/com/smartdevicelink/util/SdlAppInfo.java b/sdl_android/src/main/java/com/smartdevicelink/util/SdlAppInfo.java
index 38e881b60..bdc588b1b 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/util/SdlAppInfo.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/util/SdlAppInfo.java
@@ -33,14 +33,12 @@
 package com.smartdevicelink.util;
 
 import android.content.ComponentName;
-import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.ResolveInfo;
 import android.os.Bundle;
 import android.util.Log;
 
 import java.util.Comparator;
-import java.util.Set;
 
 /**
  * Created by Joey Grover on 2/2/18.