Merge "DozeService: Fix crash if StatusBar not yet initialized" (59011d0f) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/doze/DozeFactory.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -152,7 +152,7 @@ public class DozeFactory {
		}
		}

		private static DozeHost getHost(DozeService service) {
		public static DozeHost getHost(DozeService service) {
		Application appCandidate = service.getApplication();
		final SystemUIApplication app = (SystemUIApplication) appCandidate;
		return app.getComponent(DozeHost.class);

+8 −1

Original line number	Diff line number	Diff line
		@@ -42,6 +42,11 @@ public class DozeService extends DreamService implements DozeMachine.Service {

		setWindowless(true);

		if (DozeFactory.getHost(this) == null) {
		finish();
		return;
		}

		DozeProvider provider = PluginManager.getInstance(this)
		.getOneShotPlugin(DozeProvider.ACTION, DozeProvider.VERSION);
		mDozeMachine = new DozeFactory(provider).assembleMachine(this);
		@@ -62,6 +67,8 @@ public class DozeService extends DreamService implements DozeMachine.Service {

		@Override
		protected void dumpOnHandler(FileDescriptor fd, PrintWriter pw, String[] args) {
		if (mDozeMachine != null) {
		mDozeMachine.dump(pw);
		}
		}
		}