Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Release doze lock when the dream component changes" into tm-qpr-dev am: 3437745a96

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

Change-Id: Ic8ec681f746de82e7ed2290ead29ec81831d44d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Galia Peycheva
2023-02-08 15:46:32 +00:00
committed by Automerger Merge Worker
parent c94e56ebaa 3437745a96
commit 88068858d3
2 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/dreams/DreamController.java
View File

@@ -244,8 +244,6 @@ final class DreamController {
} }
mListener.onDreamStopped(dream.mToken); mListener.onDreamStopped(dream.mToken);
} else if (dream.mCanDoze && !mCurrentDream.mCanDoze) {
mListener.stopDozing(dream.mToken);
} }
} finally { } finally {
@@ -292,7 +290,6 @@ final class DreamController {
*/ */
public interface Listener { public interface Listener {
void onDreamStopped(Binder token); void onDreamStopped(Binder token);
void stopDozing(Binder token);
} }
private final class DreamRecord implements DeathRecipient, ServiceConnection { private final class DreamRecord implements DeathRecipient, ServiceConnection {

16
services/core/java/com/android/server/dreams/DreamManagerService.java
View File

@@ -499,12 +499,7 @@ public final class DreamManagerService extends SystemService {
} }
synchronized (mLock) { synchronized (mLock) {
if (mCurrentDream == null) { if (mCurrentDream != null && mCurrentDream.token == token && mCurrentDream.isDozing) {
return;
}
final boolean sameDream = mCurrentDream.token == token;
if ((sameDream && mCurrentDream.isDozing) || (!sameDream && !mCurrentDream.isDozing)) {
mCurrentDream.isDozing = false; mCurrentDream.isDozing = false;
mDozeWakeLock.release(); mDozeWakeLock.release();
mPowerManagerInternal.setDozeOverrideFromDreamManager( mPowerManagerInternal.setDozeOverrideFromDreamManager(
@@ -665,6 +660,10 @@ public final class DreamManagerService extends SystemService {
Slog.i(TAG, "Entering dreamland."); Slog.i(TAG, "Entering dreamland.");
if (mCurrentDream != null && mCurrentDream.isDozing) {
stopDozingInternal(mCurrentDream.token);
}
mCurrentDream = new DreamRecord(name, userId, isPreviewMode, canDoze); mCurrentDream = new DreamRecord(name, userId, isPreviewMode, canDoze);
if (!mCurrentDream.name.equals(mAmbientDisplayComponent)) { if (!mCurrentDream.name.equals(mAmbientDisplayComponent)) {
@@ -770,11 +769,6 @@ public final class DreamManagerService extends SystemService {
} }
} }
} }
@Override
public void stopDozing(Binder token) {
stopDozingInternal(token);
}
}; };
private final ContentObserver mDozeEnabledObserver = new ContentObserver(null) { private final ContentObserver mDozeEnabledObserver = new ContentObserver(null) {