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

Commit ace125c6 authored by Paul Lawrence's avatar Paul Lawrence Committed by android-build-merger
Browse files

Merge "Fix FDE" into pi-dev am: 729ebf23 

am: 2304a1eb

Change-Id: I6579f2e55ea9da1a71c977e2b23fb2833c10d12c
parents da181a63 2304a1eb

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

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

            traceEnd();



            if (!mOnlyCore) {

                if (context.getPackageManager().hasSystemFeature(

                            PackageManager.FEATURE_WIFI)) {

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

                    traceEnd();

                }

            }



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

                mPackageManager.hasSystemFeature(PackageManager.FEATURE_USB_HOST)) {