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

Commit 54271901 authored by Paul Lawrence's avatar Paul Lawrence
Browse files

Fix FDE 

Wifi services crash if run during crypto bounce and are
unnecessary. Disable.

Test: Cherry-pick ag/3898232. System boots, can set pattern, system
      reboots. Wifi works at all points.
Bug: 76452634

Change-Id: Id345082f455617386de7fac23fe84e44a8dee6d9
parent 5e09e0a3

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)) {