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

Commit c0bd9458 authored by Roshan Pius's avatar Roshan Pius
Browse files

Revert "Fix FDE" 

This reverts commit 54271901.

Wifi service is assumed to be always up by other parts of the Android
system. So, not starting wifi service will cause NPE crashes all over
the place.

Wifi service already goes into idle mode to handle this FDE transition,
so there is no need for it to be turned off.

Bug: 78663946
Test: Manually verified non-FDE to FDE transition on Taimen (Using
ag/6180881).

Change-Id: I2d4d38e978a671f4dcd671524a1b38f557510bf5
parent 991761a4

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

+35 −37
Original line number Diff line number Diff line
@@ -1286,7 +1286,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.
@@ -1327,7 +1326,6 @@ public final class SystemServer { 
                mSystemServiceManager.startService(LOWPAN_SERVICE_CLASS);

                traceEnd();

            }

            }



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

                    mPackageManager.hasSystemFeature(PackageManager.FEATURE_USB_HOST)) {