Merge "Refine Java imports" am: 402ab4e3bc

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Nfc/+/2045076

Change-Id: I0e5c20ee2bd16c18cc0124812156cb8da6a0b274
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

32 files changed, 82 insertions, 107 deletions

diff --git a/src/com/android/nfc/BeamShareActivity.java b/src/com/android/nfc/BeamShareActivity.java
index 9a01918c..a24130f0 100644
--- a/src/com/android/nfc/BeamShareActivity.java
+++ b/src/com/android/nfc/BeamShareActivity.java
@@ -16,16 +16,14 @@
 
 package com.android.nfc;
 
-import java.util.ArrayList;
-
+import android.Manifest.permission;
 import android.app.Activity;
-import android.app.ActivityManager;
 import android.app.ActivityManagerNative;
 import android.app.AlertDialog;
 import android.content.BroadcastReceiver;
+import android.content.ClipData;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.content.ClipData;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.pm.PackageManager;
@@ -35,17 +33,18 @@ import android.nfc.NdefMessage;
 import android.nfc.NdefRecord;
 import android.nfc.NfcAdapter;
 import android.os.Bundle;
+import android.os.RemoteException;
 import android.os.SystemProperties;
 import android.os.UserHandle;
-import android.os.RemoteException;
-import android.util.Log;
 import android.util.EventLog;
+import android.util.Log;
 import android.webkit.URLUtil;
-import android.Manifest.permission;
 import android.widget.Toast;
 
 import com.android.internal.R;
 
+import java.util.ArrayList;
+
 /**
  * This class is registered by NfcService to handle
  * ACTION_SHARE intents. It tries to parse data contained
diff --git a/src/com/android/nfc/DtaServiceConnector.java b/src/com/android/nfc/DtaServiceConnector.java
index 147084b7..04c053ab 100644
--- a/src/com/android/nfc/DtaServiceConnector.java
+++ b/src/com/android/nfc/DtaServiceConnector.java
@@ -16,8 +16,6 @@
 
 package com.android.nfc;
 
-import java.util.List;
-
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -30,6 +28,8 @@ import android.os.Message;
 import android.os.Messenger;
 import android.os.RemoteException;
 
+import java.util.List;
+
 public class DtaServiceConnector {
 
 
diff --git a/src/com/android/nfc/ForegroundUtils.java b/src/com/android/nfc/ForegroundUtils.java
index c1068246..4ecec4b1 100644
--- a/src/com/android/nfc/ForegroundUtils.java
+++ b/src/com/android/nfc/ForegroundUtils.java
@@ -15,9 +15,6 @@
  */
 package com.android.nfc;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import android.app.ActivityManager;
 import android.app.IActivityManager;
 import android.app.IProcessObserver;
@@ -27,6 +24,9 @@ import android.util.Log;
 import android.util.SparseArray;
 import android.util.SparseBooleanArray;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class ForegroundUtils extends IProcessObserver.Stub {
     static final boolean DBG = SystemProperties.getBoolean("persist.nfc.debug_enabled", false);;
     private final String TAG = "ForegroundUtils";
diff --git a/src/com/android/nfc/NfcApplication.java b/src/com/android/nfc/NfcApplication.java
index 6210c2d6..1ae45373 100644
--- a/src/com/android/nfc/NfcApplication.java
+++ b/src/com/android/nfc/NfcApplication.java
@@ -19,10 +19,10 @@ package com.android.nfc;
 import android.app.ActivityManager;
 import android.app.ActivityManager.RunningAppProcessInfo;
 import android.app.Application;
+import android.content.pm.PackageManager;
 import android.os.Process;
 import android.os.UserHandle;
 import android.view.ThreadedRenderer;
-import android.content.pm.PackageManager;
 
 import java.util.Iterator;
 import java.util.List;
diff --git a/src/com/android/nfc/NfcBackupAgent.java b/src/com/android/nfc/NfcBackupAgent.java
index 98637dbf..58015b67 100644
--- a/src/com/android/nfc/NfcBackupAgent.java
+++ b/src/com/android/nfc/NfcBackupAgent.java
@@ -18,9 +18,9 @@ package com.android.nfc;
 
 import android.app.backup.BackupAgentHelper;
 import android.app.backup.SharedPreferencesBackupHelper;
+import android.content.Context;
 import android.content.SharedPreferences;
 import android.nfc.NfcAdapter;
-import android.content.Context;
 
 public class NfcBackupAgent extends BackupAgentHelper {
     // Backup identifier
diff --git a/src/com/android/nfc/NfcBlockedNotification.java b/src/com/android/nfc/NfcBlockedNotification.java
index 9db74f65..83d02bbb 100644
--- a/src/com/android/nfc/NfcBlockedNotification.java
+++ b/src/com/android/nfc/NfcBlockedNotification.java
@@ -25,8 +25,6 @@ import android.content.Intent;
 import android.net.Uri;
 import android.text.TextUtils;
 
-import com.android.nfc.R;
-
 /**
  * This class handles the Notification Manager for the antenna blocked notification
  */
diff --git a/src/com/android/nfc/NfcWifiProtectedSetup.java b/src/com/android/nfc/NfcWifiProtectedSetup.java
index a078efcd..e2e24ed6 100644
--- a/src/com/android/nfc/NfcWifiProtectedSetup.java
+++ b/src/com/android/nfc/NfcWifiProtectedSetup.java
@@ -25,11 +25,9 @@ import android.nfc.NdefRecord;
 import android.nfc.tech.Ndef;
 import android.os.UserHandle;
 import android.os.UserManager;
-import android.util.Log;
 
 import java.nio.BufferUnderflowException;
 import java.nio.ByteBuffer;
-import java.util.Arrays;
 import java.util.BitSet;
 
 public final class NfcWifiProtectedSetup {
diff --git a/src/com/android/nfc/P2pEventManager.java b/src/com/android/nfc/P2pEventManager.java
index faec6100..77167f51 100644
--- a/src/com/android/nfc/P2pEventManager.java
+++ b/src/com/android/nfc/P2pEventManager.java
@@ -16,13 +16,13 @@
 
 package com.android.nfc;
 
-import com.android.nfc.beam.SendUi;
-
 import android.app.NotificationManager;
 import android.content.Context;
 import android.content.res.Configuration;
 import android.os.Vibrator;
 
+import com.android.nfc.beam.SendUi;
+
 /**
  * Manages vibration, sound and animation for P2P events.
  */
diff --git a/src/com/android/nfc/P2pLinkManager.java b/src/com/android/nfc/P2pLinkManager.java
index a0cb5d3a..fc39c0ac 100755
--- a/src/com/android/nfc/P2pLinkManager.java
+++ b/src/com/android/nfc/P2pLinkManager.java
@@ -56,7 +56,6 @@ import java.io.PrintWriter;
 import java.io.UnsupportedEncodingException;
 import java.util.List;
 
-
 /**
  * Interface to listen for P2P events.
  * All callbacks are made from the UI thread.
diff --git a/src/com/android/nfc/RegisteredComponentCache.java b/src/com/android/nfc/RegisteredComponentCache.java
index 8e0a3aa7..a92c6e32 100644
--- a/src/com/android/nfc/RegisteredComponentCache.java
+++ b/src/com/android/nfc/RegisteredComponentCache.java
@@ -16,9 +16,6 @@
 
 package com.android.nfc;
 
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 import android.app.ActivityManager;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -26,14 +23,17 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
 import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.pm.ResolveInfo;
 import android.content.res.Resources;
 import android.content.res.XmlResourceParser;
 import android.os.SystemProperties;
 import android.os.UserHandle;
 import android.util.Log;
 
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/android/nfc/TechListChooserActivity.java b/src/com/android/nfc/TechListChooserActivity.java
index 8c2c34e4..962daede 100644
--- a/src/com/android/nfc/TechListChooserActivity.java
+++ b/src/com/android/nfc/TechListChooserActivity.java
@@ -16,14 +16,14 @@
 
 package com.android.nfc;
 
-import com.android.internal.app.ResolverActivity;
-
 import android.content.Intent;
 import android.content.pm.ResolveInfo;
 import android.os.Bundle;
 import android.os.Parcelable;
 import android.util.Log;
 
+import com.android.internal.app.ResolverActivity;
+
 import java.util.ArrayList;
 
 public class TechListChooserActivity extends ResolverActivity {
diff --git a/src/com/android/nfc/beam/BeamManager.java b/src/com/android/nfc/beam/BeamManager.java
index 9917ebd0..b3533a54 100644
--- a/src/com/android/nfc/beam/BeamManager.java
+++ b/src/com/android/nfc/beam/BeamManager.java
@@ -15,10 +15,6 @@
 */
 package com.android.nfc.beam;
 
-import com.android.nfc.NfcService;
-import com.android.nfc.R;
-import com.android.nfc.handover.HandoverDataParser;
-
 import android.bluetooth.BluetoothDevice;
 import android.content.Context;
 import android.content.Intent;
@@ -31,6 +27,10 @@ import android.os.SystemProperties;
 import android.os.UserHandle;
 import android.util.Log;
 
+import com.android.nfc.NfcService;
+import com.android.nfc.R;
+import com.android.nfc.handover.HandoverDataParser;
+
 /**
  * Manager for starting and stopping Beam transfers. Prevents more than one transfer from
  * happening at a time.
diff --git a/src/com/android/nfc/beam/BeamReceiveService.java b/src/com/android/nfc/beam/BeamReceiveService.java
index 5602997b..9327e735 100644
--- a/src/com/android/nfc/beam/BeamReceiveService.java
+++ b/src/com/android/nfc/beam/BeamReceiveService.java
@@ -4,7 +4,6 @@ import android.app.Service;
 import android.bluetooth.BluetoothAdapter;
 import android.content.Context;
 import android.content.Intent;
-import android.content.IntentFilter;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Message;
@@ -12,7 +11,6 @@ import android.os.Messenger;
 import android.os.RemoteException;
 import android.util.Log;
 
-
 /**
  * @hide
  */
diff --git a/src/com/android/nfc/beam/BeamStatusReceiver.java b/src/com/android/nfc/beam/BeamStatusReceiver.java
index 23e1ce80..eb529b5c 100644
--- a/src/com/android/nfc/beam/BeamStatusReceiver.java
+++ b/src/com/android/nfc/beam/BeamStatusReceiver.java
@@ -1,7 +1,5 @@
 package com.android.nfc.beam;
 
-import com.android.nfc.R;
-
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -9,6 +7,8 @@ import android.content.IntentFilter;
 import android.net.Uri;
 import android.util.Log;
 
+import com.android.nfc.R;
+
 import java.io.File;
 
 /**
diff --git a/src/com/android/nfc/beam/BeamTransferManager.java b/src/com/android/nfc/beam/BeamTransferManager.java
index cb59c280..d1f6e07b 100644
--- a/src/com/android/nfc/beam/BeamTransferManager.java
+++ b/src/com/android/nfc/beam/BeamTransferManager.java
@@ -16,15 +16,12 @@
 
 package com.android.nfc.beam;
 
-import com.android.nfc.R;
-
 import android.app.Notification;
+import android.app.Notification.Builder;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
-import android.app.Notification.Builder;
 import android.bluetooth.BluetoothDevice;
-import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.media.MediaScannerConnection;
@@ -37,6 +34,10 @@ import android.os.SystemClock;
 import android.os.UserHandle;
 import android.util.Log;
 
+import androidx.core.content.FileProvider;
+
+import com.android.nfc.R;
+
 import java.io.File;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -45,8 +46,6 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.Locale;
 
-import androidx.core.content.FileProvider;
-
 /**
  * A BeamTransferManager object represents a set of files
  * that were received through NFC connection handover
diff --git a/src/com/android/nfc/beam/BluetoothOppHandover.java b/src/com/android/nfc/beam/BluetoothOppHandover.java
index 292d93c0..d9491a43 100644
--- a/src/com/android/nfc/beam/BluetoothOppHandover.java
+++ b/src/com/android/nfc/beam/BluetoothOppHandover.java
@@ -16,8 +16,6 @@
 
 package com.android.nfc.beam;
 
-import com.android.nfc.R;
-
 import android.bluetooth.BluetoothDevice;
 import android.content.Context;
 import android.content.Intent;
@@ -27,6 +25,8 @@ import android.os.Message;
 import android.os.SystemClock;
 import android.util.Log;
 
+import com.android.nfc.R;
+
 import java.util.ArrayList;
 
 public class BluetoothOppHandover implements Handler.Callback {
diff --git a/src/com/android/nfc/beam/SendUi.java b/src/com/android/nfc/beam/SendUi.java
index 966d1376..24d4a299 100644
--- a/src/com/android/nfc/beam/SendUi.java
+++ b/src/com/android/nfc/beam/SendUi.java
@@ -32,7 +32,6 @@ import android.content.IntentFilter;
 import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;
 import android.graphics.Bitmap;
-import android.graphics.Canvas;
 import android.graphics.Matrix;
 import android.graphics.PixelFormat;
 import android.graphics.Rect;
@@ -45,7 +44,6 @@ import android.util.Log;
 import android.view.ActionMode;
 import android.view.Display;
 import android.view.KeyEvent;
-import android.view.KeyboardShortcutGroup;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -65,11 +63,10 @@ import android.view.animation.DecelerateInterpolator;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
+
 import com.android.internal.policy.PhoneWindow;
 import com.android.internal.policy.SystemBarUtils;
 import com.android.nfc.R;
-import com.android.nfc.beam.FireflyRenderer;
-import java.util.List;
 
 /**
  * This class is responsible for handling the UI animation
diff --git a/src/com/android/nfc/cardemulation/AidRoutingManager.java b/src/com/android/nfc/cardemulation/AidRoutingManager.java
index dd3c518b..38e0af74 100644
--- a/src/com/android/nfc/cardemulation/AidRoutingManager.java
+++ b/src/com/android/nfc/cardemulation/AidRoutingManager.java
@@ -22,6 +22,7 @@ import android.util.proto.ProtoOutputStream;
 
 import com.android.nfc.NfcService;
 import com.android.nfc.NfcStatsLog;
+
 import java.io.FileDescriptor;
 import java.io.PrintWriter;
 import java.util.ArrayList;
diff --git a/src/com/android/nfc/echoserver/EchoServer.java b/src/com/android/nfc/echoserver/EchoServer.java
index 71d0bf8e..2c81f59b 100644
--- a/src/com/android/nfc/echoserver/EchoServer.java
+++ b/src/com/android/nfc/echoserver/EchoServer.java
@@ -16,17 +16,17 @@
 
 package com.android.nfc.echoserver;
 
+import android.os.Handler;
+import android.os.Message;
+import android.util.Log;
+
 import com.android.nfc.DeviceHost.LlcpConnectionlessSocket;
-import com.android.nfc.LlcpException;
 import com.android.nfc.DeviceHost.LlcpServerSocket;
 import com.android.nfc.DeviceHost.LlcpSocket;
+import com.android.nfc.LlcpException;
 import com.android.nfc.LlcpPacket;
 import com.android.nfc.NfcService;
 
-import android.os.Handler;
-import android.os.Message;
-import android.util.Log;
-
 import java.io.IOException;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
diff --git a/src/com/android/nfc/handover/HandoverClient.java b/src/com/android/nfc/handover/HandoverClient.java
index 19e9c808..ea56ca74 100644
--- a/src/com/android/nfc/handover/HandoverClient.java
+++ b/src/com/android/nfc/handover/HandoverClient.java
@@ -20,9 +20,9 @@ import android.nfc.NdefMessage;
 import android.os.SystemProperties;
 import android.util.Log;
 
+import com.android.nfc.DeviceHost.LlcpSocket;
 import com.android.nfc.LlcpException;
 import com.android.nfc.NfcService;
-import com.android.nfc.DeviceHost.LlcpSocket;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/src/com/android/nfc/handover/HandoverDataParser.java b/src/com/android/nfc/handover/HandoverDataParser.java
index bc6d29b5..de201799 100644
--- a/src/com/android/nfc/handover/HandoverDataParser.java
+++ b/src/com/android/nfc/handover/HandoverDataParser.java
@@ -21,22 +21,18 @@ import android.bluetooth.BluetoothClass;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothUuid;
 import android.bluetooth.OobData;
-import android.content.Context;
-import android.content.Intent;
 import android.nfc.FormatException;
 import android.nfc.NdefMessage;
 import android.nfc.NdefRecord;
 import android.os.Parcel;
 import android.os.ParcelUuid;
 import android.os.SystemProperties;
-import android.os.UserHandle;
 import android.util.Log;
+
 import java.nio.BufferUnderflowException;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
-import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Random;
 
diff --git a/src/com/android/nfc/handover/HandoverServer.java b/src/com/android/nfc/handover/HandoverServer.java
index ffd76162..4c63453f 100644
--- a/src/com/android/nfc/handover/HandoverServer.java
+++ b/src/com/android/nfc/handover/HandoverServer.java
@@ -15,23 +15,18 @@
  */
 package com.android.nfc.handover;
 
-import com.android.nfc.DeviceHost.LlcpServerSocket;
-import com.android.nfc.DeviceHost.LlcpSocket;
-import com.android.nfc.LlcpException;
-import com.android.nfc.NfcService;
-import com.android.nfc.beam.BeamManager;
-import com.android.nfc.beam.BeamReceiveService;
-import com.android.nfc.beam.BeamTransferRecord;
-
-import android.bluetooth.BluetoothDevice;
 import android.content.Context;
-import android.content.Intent;
 import android.nfc.FormatException;
 import android.nfc.NdefMessage;
 import android.os.SystemProperties;
-import android.os.UserHandle;
 import android.util.Log;
 
+import com.android.nfc.DeviceHost.LlcpServerSocket;
+import com.android.nfc.DeviceHost.LlcpSocket;
+import com.android.nfc.LlcpException;
+import com.android.nfc.NfcService;
+import com.android.nfc.beam.BeamManager;
+
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.Arrays;
diff --git a/src/com/android/nfc/handover/PeripheralHandoverService.java b/src/com/android/nfc/handover/PeripheralHandoverService.java
index b4b0d5f4..39b60e1a 100644
--- a/src/com/android/nfc/handover/PeripheralHandoverService.java
+++ b/src/com/android/nfc/handover/PeripheralHandoverService.java
@@ -31,8 +31,8 @@ import android.os.Handler;
 import android.os.IBinder;
 import android.os.Message;
 import android.os.Messenger;
-import android.os.Parcelable;
 import android.os.ParcelUuid;
+import android.os.Parcelable;
 import android.os.RemoteException;
 import android.util.Log;
 
diff --git a/src/com/android/nfc/ndefpush/NdefPushClient.java b/src/com/android/nfc/ndefpush/NdefPushClient.java
index 842fb988..bb80c223 100755
--- a/src/com/android/nfc/ndefpush/NdefPushClient.java
+++ b/src/com/android/nfc/ndefpush/NdefPushClient.java
@@ -16,13 +16,13 @@
 
 package com.android.nfc.ndefpush;
 
+import android.nfc.NdefMessage;
+import android.util.Log;
+
 import com.android.nfc.DeviceHost.LlcpSocket;
 import com.android.nfc.LlcpException;
 import com.android.nfc.NfcService;
 
-import android.nfc.NdefMessage;
-import android.util.Log;
-
 import java.io.IOException;
 import java.util.Arrays;
 
diff --git a/src/com/android/nfc/ndefpush/NdefPushProtocol.java b/src/com/android/nfc/ndefpush/NdefPushProtocol.java
index 5520615b..843687ae 100644
--- a/src/com/android/nfc/ndefpush/NdefPushProtocol.java
+++ b/src/com/android/nfc/ndefpush/NdefPushProtocol.java
@@ -16,14 +16,13 @@
 
 package com.android.nfc.ndefpush;
 
-import android.util.Log;
-
-import android.nfc.NdefMessage;
 import android.nfc.FormatException;
+import android.nfc.NdefMessage;
+import android.util.Log;
 
 import java.io.ByteArrayInputStream;
-import java.io.DataInputStream;
 import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
 import java.io.DataOutputStream;
 
 /**
diff --git a/src/com/android/nfc/ndefpush/NdefPushServer.java b/src/com/android/nfc/ndefpush/NdefPushServer.java
index 82b37dec..5f5bfef5 100755
--- a/src/com/android/nfc/ndefpush/NdefPushServer.java
+++ b/src/com/android/nfc/ndefpush/NdefPushServer.java
@@ -16,16 +16,16 @@
 
 package com.android.nfc.ndefpush;
 
-import com.android.nfc.DeviceHost.LlcpServerSocket;
-import com.android.nfc.DeviceHost.LlcpSocket;
-import com.android.nfc.LlcpException;
-import com.android.nfc.NfcService;
-
 import android.nfc.FormatException;
 import android.nfc.NdefMessage;
 import android.nfc.NfcAdapter;
 import android.util.Log;
 
+import com.android.nfc.DeviceHost.LlcpServerSocket;
+import com.android.nfc.DeviceHost.LlcpSocket;
+import com.android.nfc.LlcpException;
+import com.android.nfc.NfcService;
+
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
diff --git a/src/com/android/nfc/snep/SnepClient.java b/src/com/android/nfc/snep/SnepClient.java
index 4aa6715f..2bfa7cda 100644
--- a/src/com/android/nfc/snep/SnepClient.java
+++ b/src/com/android/nfc/snep/SnepClient.java
@@ -16,14 +16,14 @@
 
 package com.android.nfc.snep;
 
-import com.android.nfc.DeviceHost.LlcpSocket;
-import com.android.nfc.LlcpException;
-import com.android.nfc.NfcService;
-
 import android.nfc.NdefMessage;
 import android.os.SystemProperties;
 import android.util.Log;
 
+import com.android.nfc.DeviceHost.LlcpSocket;
+import com.android.nfc.LlcpException;
+import com.android.nfc.NfcService;
+
 import java.io.IOException;
 
 public final class SnepClient {
diff --git a/src/com/android/nfc/snep/SnepMessage.java b/src/com/android/nfc/snep/SnepMessage.java
index 4c3ad995..a41be9e1 100644
--- a/src/com/android/nfc/snep/SnepMessage.java
+++ b/src/com/android/nfc/snep/SnepMessage.java
@@ -19,6 +19,7 @@ package com.android.nfc.snep;
 import android.nfc.FormatException;
 import android.nfc.NdefMessage;
 import android.nfc.NdefRecord;
+
 import com.android.nfc.NfcService;
 import com.android.nfc.sneptest.DtaSnepClient;
 
diff --git a/src/com/android/nfc/snep/SnepMessenger.java b/src/com/android/nfc/snep/SnepMessenger.java
index 0d5dade9..a6ed4fff 100644
--- a/src/com/android/nfc/snep/SnepMessenger.java
+++ b/src/com/android/nfc/snep/SnepMessenger.java
@@ -16,15 +16,15 @@
 
 package com.android.nfc.snep;
 
+import android.nfc.FormatException;
+import android.os.SystemProperties;
+import android.util.Log;
+
 import com.android.nfc.DeviceHost.LlcpSocket;
 import com.android.nfc.NfcService;
 import com.android.nfc.sneptest.DtaSnepClient;
 import com.android.nfc.sneptest.ExtDtaSnepServer;
 
-import android.nfc.FormatException;
-import android.os.SystemProperties;
-import android.util.Log;
-
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
diff --git a/src/com/android/nfc/snep/SnepServer.java b/src/com/android/nfc/snep/SnepServer.java
index a06f4c08..dbdca92f 100644
--- a/src/com/android/nfc/snep/SnepServer.java
+++ b/src/com/android/nfc/snep/SnepServer.java
@@ -16,16 +16,16 @@
 
 package com.android.nfc.snep;
 
-import com.android.nfc.DeviceHost.LlcpServerSocket;
-import com.android.nfc.DeviceHost.LlcpSocket;
-import com.android.nfc.LlcpException;
-import com.android.nfc.NfcService;
-
 import android.nfc.NdefMessage;
 import android.nfc.NfcAdapter;
 import android.os.SystemProperties;
 import android.util.Log;
 
+import com.android.nfc.DeviceHost.LlcpServerSocket;
+import com.android.nfc.DeviceHost.LlcpSocket;
+import com.android.nfc.LlcpException;
+import com.android.nfc.NfcService;
+
 import java.io.IOException;
 
 /**
diff --git a/src/com/android/nfc/sneptest/DtaSnepClient.java b/src/com/android/nfc/sneptest/DtaSnepClient.java
index 6087b6e7..25c5f75b 100644
--- a/src/com/android/nfc/sneptest/DtaSnepClient.java
+++ b/src/com/android/nfc/sneptest/DtaSnepClient.java
@@ -15,26 +15,21 @@
  */
 package com.android.nfc.sneptest;
 
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-
-import android.content.ComponentName;
 import android.content.Context;
-import android.content.Intent;
-import android.content.ServiceConnection;
 import android.nfc.NdefMessage;
-import android.os.IBinder;
-import android.os.Messenger;
 import android.util.Log;
 
 import com.android.nfc.DeviceHost.LlcpSocket;
+import com.android.nfc.DtaServiceConnector;
 import com.android.nfc.LlcpException;
 import com.android.nfc.NfcService;
-import com.android.nfc.DtaServiceConnector;
 import com.android.nfc.snep.SnepException;
 import com.android.nfc.snep.SnepMessage;
 import com.android.nfc.snep.SnepMessenger;
 
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+
 public final class DtaSnepClient {
     private static final String TAG = "DtaSnepClient";
     private static final boolean DBG = true;
diff --git a/src/com/android/nfc/sneptest/ExtDtaSnepServer.java b/src/com/android/nfc/sneptest/ExtDtaSnepServer.java
index a90cc7be..743b0979 100644
--- a/src/com/android/nfc/sneptest/ExtDtaSnepServer.java
+++ b/src/com/android/nfc/sneptest/ExtDtaSnepServer.java
@@ -15,21 +15,21 @@
  */
 package com.android.nfc.sneptest;
 
-import java.io.IOException;
-
 import android.content.Context;
 import android.nfc.NdefMessage;
 import android.util.Log;
 
-import com.android.nfc.DtaServiceConnector;
 import com.android.nfc.DeviceHost.LlcpServerSocket;
 import com.android.nfc.DeviceHost.LlcpSocket;
+import com.android.nfc.DtaServiceConnector;
 import com.android.nfc.LlcpException;
 import com.android.nfc.NfcService;
 import com.android.nfc.snep.SnepException;
 import com.android.nfc.snep.SnepMessage;
 import com.android.nfc.snep.SnepMessenger;
 
+import java.io.IOException;
+
 public final class ExtDtaSnepServer {
     private static final String TAG = "ExtDtaSnepServer";
     private static final boolean DBG = true;