Skip to content

Commit f9d40f4

Browse files
author
Jeff Brown
committed
Cure narcolepsy.
Bug: 7204211 Change-Id: I2c09abaad5d321cec6f62f7ca0ce00c3b61ee211
1 parent bc33545 commit f9d40f4

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

services/java/com/android/server/UiModeManagerService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import android.app.PendingIntent;
2626
import android.app.StatusBarManager;
2727
import android.app.UiModeManager;
28-
import android.content.ActivityNotFoundException;
2928
import android.content.BroadcastReceiver;
3029
import android.content.Context;
3130
import android.content.Intent;
@@ -497,7 +496,8 @@ private void sendConfigurationAndStartDreamOrDockAppLocked(String category) {
497496
sendConfigurationLocked();
498497

499498
// If we did not start a dock app, then start dreaming if supported.
500-
if (!dockAppStarted && isScreenSaverEnabled() && isScreenSaverActivatedOnDock()) {
499+
if (category != null && !dockAppStarted
500+
&& isScreenSaverEnabled() && isScreenSaverActivatedOnDock()) {
501501
Slog.i(TAG, "Activating dream while docked.");
502502
try {
503503
IDreamManager dreamManagerService = IDreamManager.Stub.asInterface(

0 commit comments

Comments
 (0)