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

Commit 2f30cc1c authored Apr 08, 2015 by joonyoung.cho

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

parent 40c4021a

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