fix safeMode status in AppWidgetService

AppWidgetService uses safemode value that defined on SystemServiceManager.
however mSystemServiceManager.setSafeMode never called.
therefore AppWidgetService doesn't know whether safemode or not in boot phase.
In safemode, it causes NullPointerException in parsing function.
after that all of placed widgets disappear at launcher app.

Change-Id: I7576dcba7a2f548b2afa48ff2c700372c6920fe8

2 files changed, 3 insertions, 1 deletions

diff --git a/services/appwidget/java/com/android/server/appwidget/AppWidgetService.java b/services/appwidget/java/com/android/server/appwidget/AppWidgetService.java
index 3f9542731ad3..c0f77caf820b 100644
--- a/services/appwidget/java/com/android/server/appwidget/AppWidgetService.java
+++ b/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());
         }
     }
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 78711477511f..63f22713b644 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -1035,6 +1035,8 @@ public final class SystemServer {
             reportWtf("making Display Manager Service ready", e);
         }
 
+        mSystemServiceManager.setSafeMode(safeMode);
+
         // These are needed to propagate to the runnable below.
         final MountService mountServiceF = mountService;
         final NetworkManagementService networkManagementF = networkManagement;