Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed4a6acc authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Revert "Fix FDE""

parents bc1995f7 c0bd9458

services/java/com/android/server/SystemServer.java

+35 −37
Original line number Diff line number Diff line
@@ -1285,7 +1285,6 @@ public final class SystemServer { 
            }

            traceEnd();



            if (!mOnlyCore) {

            if (context.getPackageManager().hasSystemFeature(

                    PackageManager.FEATURE_WIFI)) {

                // Wifi Service must be started first for wifi-related services.
@@ -1326,7 +1325,6 @@ public final class SystemServer { 
                mSystemServiceManager.startService(LOWPAN_SERVICE_CLASS);

                traceEnd();

            }

            }



            if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_ETHERNET) ||

                    mPackageManager.hasSystemFeature(PackageManager.FEATURE_USB_HOST)) {