Merge "fix safeMode status in AppWidgetService"

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

@@ -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

@@ -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;