Revert "base: start nfc service prior to systemui"

We no longer need to start NFC before anything else, System UI will
properly handle getting a proper refernce to the Nfc Adapter.

This reverts commit 1882a02f21f9e79550000e2b68a37acf21f26ec2.

Ticket: OPO-755
Change-Id: I14514746a55fe89e6960f4e453309da5d21012f0

1 files changed, 0 insertions, 28 deletions

diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 671bf89..f6a0619 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -1189,15 +1189,6 @@ public final class SystemServer {
                 Slog.i(TAG, "WebViewFactory preparation");
                 WebViewFactory.prepareWebViewInSystemServer();
 
-                // Start Nfc before SystemUi to ensure NfcTile and other apps gets a
-                // valid NfcAdapter from NfcManager
-                try {
-                    startNfcService(context);
-                } catch (Throwable e) {
-                    // Don't crash. Nfc is an optional service. Just annotate that isn't ready
-                    Slog.e(TAG, "Nfc service didn't start. Nfc will not be available.", e);
-                }
-
                 try {
                     startSystemUi(context);
                 } catch (Throwable e) {
@@ -1316,23 +1307,4 @@ public final class SystemServer {
         //Slog.d(TAG, "Starting service: " + intent);
         context.startServiceAsUser(intent, UserHandle.OWNER);
     }
-
-    static final void startNfcService(Context context) {
-        IPackageManager pm = ActivityThread.getPackageManager();
-        if (pm == null) {
-            Slog.w(TAG, "Cannot get package manager, assuming no NFC feature");
-            return;
-        }
-        try {
-            if (pm.hasSystemFeature(PackageManager.FEATURE_NFC)) {
-                Intent intent = new Intent();
-                intent.setComponent(new ComponentName("com.android.nfc",
-                            "com.android.nfc.NfcBootstrapService"));
-                context.startServiceAsUser(intent, UserHandle.OWNER);
-            }
-        } catch (RemoteException e) {
-            Slog.w(TAG, "Package manager query failed, assuming no NFC feature", e);
-            return;
-        }
-    }
 }