Merge "Don't allow dreaming for users that can't dream." into tm-qpr-dev am: 0a33f42345
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20683465 Change-Id: Id2cafb13e70d93f76b3b17fac56eb2f4f8a79306 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -379,6 +379,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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user