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

Commit 78a72f06 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "fix safeMode status in AppWidgetService"

parents 3f67a185 2f30cc1c

services/appwidget/java/com/android/server/appwidget/AppWidgetService.java

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ public class AppWidgetService extends SystemService { 


    @Override

    public void onBootPhase(int phase) {

        if (phase == PHASE_THIRD_PARTY_APPS_CAN_START) {

        if (phase == PHASE_ACTIVITY_MANAGER_READY) {

            mImpl.setSafeMode(isSafeMode());

        }

    }

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

+2 −0
Original line number Diff line number Diff line
@@ -1153,6 +1153,8 @@ public final class SystemServer { 
        }

        Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);



        mSystemServiceManager.setSafeMode(safeMode);



        // These are needed to propagate to the runnable below.

        final NetworkManagementService networkManagementF = networkManagement;

        final NetworkStatsService networkStatsF = networkStats;