Merge "Don't allow dreaming for users that can't dream." into tm-qpr-dev am: 0a33f42345 am: 5b77893e89

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20683465

Change-Id: I398d89655592d680cad3a6ce5d9e26ed6350454a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 4 insertions, 0 deletions

diff --git a/services/core/java/com/android/server/dreams/DreamManagerService.java b/services/core/java/com/android/server/dreams/DreamManagerService.java
index ea096299cf48..b8225419cb9b 100644
--- a/services/core/java/com/android/server/dreams/DreamManagerService.java
+++ b/services/core/java/com/android/server/dreams/DreamManagerService.java
@@ -378,6 +378,10 @@ public final class DreamManagerService extends SystemService {
                 return false;
             }
 
+            if (!dreamsEnabledForUser(ActivityManager.getCurrentUser())) {
+                return false;
+            }
+
             if ((mWhenToDream & DREAM_ON_CHARGE) == DREAM_ON_CHARGE) {
                 return mIsCharging;
             }