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

Commit 19acc902 authored by joonyoung.cho's avatar joonyoung.cho Committed by android-build-merger
Browse files

Merge "fix safeMode status in AppWidgetService" am: 78a72f06 am: cbd4ad1f am: 5a3034f8 

am: 2f51366c

Change-Id: I64ed50a3f2d6fa20650c047bda0da1ad0cd292f4
parents 194b301b 2f51366c

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
@@ -1275,6 +1275,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;