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

Merge "Send all-window-drawn message of caller directly" into udc-dev am: 4b6517670a

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

Change-Id: I9c9b640842166c2771cef7ac3de8a0f6b0409b52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Riddle Hsu
2023-07-03 11:00:55 +00:00
committed by Automerger Merge Worker
parent e92c88a901 4b6517670a
commit a1520a6308
3 changed files with 29 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
services/core/java/com/android/server/policy/PhoneWindowManager.java
View File

@@ -702,8 +702,11 @@ public class PhoneWindowManager implements WindowManagerPolicy {
finishKeyguardDrawn(); finishKeyguardDrawn();
break; break;
case MSG_WINDOW_MANAGER_DRAWN_COMPLETE: case MSG_WINDOW_MANAGER_DRAWN_COMPLETE:
if (DEBUG_WAKEUP) Slog.w(TAG, "Setting mWindowManagerDrawComplete"); final int displayId = msg.arg1;
finishWindowsDrawn(msg.arg1); if (DEBUG_WAKEUP) Slog.w(TAG, "All windows drawn on display " + displayId);
Trace.asyncTraceEnd(Trace.TRACE_TAG_WINDOW_MANAGER,
TRACE_WAIT_FOR_ALL_WINDOWS_DRAWN_METHOD, displayId /* cookie */);
finishWindowsDrawn(displayId);
break; break;
case MSG_HIDE_BOOT_MESSAGE: case MSG_HIDE_BOOT_MESSAGE:
handleHideBootMessage(); handleHideBootMessage();
@@ -4996,15 +4999,10 @@ public class PhoneWindowManager implements WindowManagerPolicy {
// ... eventually calls finishWindowsDrawn which will finalize our screen turn on // ... eventually calls finishWindowsDrawn which will finalize our screen turn on
// as well as enabling the orientation change logic/sensor. // as well as enabling the orientation change logic/sensor.
Trace.asyncTraceBegin(Trace.TRACE_TAG_WINDOW_MANAGER, Trace.asyncTraceBegin(Trace.TRACE_TAG_WINDOW_MANAGER,
TRACE_WAIT_FOR_ALL_WINDOWS_DRAWN_METHOD, /* cookie= */ 0); TRACE_WAIT_FOR_ALL_WINDOWS_DRAWN_METHOD, INVALID_DISPLAY /* cookie */);
mWindowManagerInternal.waitForAllWindowsDrawn(() -> { mWindowManagerInternal.waitForAllWindowsDrawn(mHandler.obtainMessage(
if (DEBUG_WAKEUP) Slog.i(TAG, "All windows ready for every display"); MSG_WINDOW_MANAGER_DRAWN_COMPLETE, INVALID_DISPLAY, 0),
mHandler.sendMessage(mHandler.obtainMessage(MSG_WINDOW_MANAGER_DRAWN_COMPLETE, WAITING_FOR_DRAWN_TIMEOUT, INVALID_DISPLAY);
INVALID_DISPLAY, 0));
Trace.asyncTraceEnd(Trace.TRACE_TAG_WINDOW_MANAGER,
TRACE_WAIT_FOR_ALL_WINDOWS_DRAWN_METHOD, /* cookie= */ 0);
}, WAITING_FOR_DRAWN_TIMEOUT, INVALID_DISPLAY);
} }
// Called on the DisplayManager's DisplayPowerController thread. // Called on the DisplayManager's DisplayPowerController thread.
@@ -5084,15 +5082,10 @@ public class PhoneWindowManager implements WindowManagerPolicy {
mScreenOnListeners.put(displayId, screenOnListener); mScreenOnListeners.put(displayId, screenOnListener);
Trace.asyncTraceBegin(Trace.TRACE_TAG_WINDOW_MANAGER, Trace.asyncTraceBegin(Trace.TRACE_TAG_WINDOW_MANAGER,
TRACE_WAIT_FOR_ALL_WINDOWS_DRAWN_METHOD, /* cookie= */ 0); TRACE_WAIT_FOR_ALL_WINDOWS_DRAWN_METHOD, displayId /* cookie */);
mWindowManagerInternal.waitForAllWindowsDrawn(() -> { mWindowManagerInternal.waitForAllWindowsDrawn(mHandler.obtainMessage(
if (DEBUG_WAKEUP) Slog.i(TAG, "All windows ready for display: " + displayId); MSG_WINDOW_MANAGER_DRAWN_COMPLETE, displayId, 0),
mHandler.sendMessage(mHandler.obtainMessage(MSG_WINDOW_MANAGER_DRAWN_COMPLETE, WAITING_FOR_DRAWN_TIMEOUT, displayId);
displayId, 0));
Trace.asyncTraceEnd(Trace.TRACE_TAG_WINDOW_MANAGER,
TRACE_WAIT_FOR_ALL_WINDOWS_DRAWN_METHOD, /* cookie= */ 0);
}, WAITING_FOR_DRAWN_TIMEOUT, displayId);
} }
} }

6
services/core/java/com/android/server/wm/WindowManagerInternal.java
View File

@@ -30,6 +30,7 @@ import android.graphics.Region;
import android.hardware.display.DisplayManagerInternal; import android.hardware.display.DisplayManagerInternal;
import android.os.Bundle; import android.os.Bundle;
import android.os.IBinder; import android.os.IBinder;
import android.os.Message;
import android.util.Pair; import android.util.Pair;
import android.view.ContentRecordingSession; import android.view.ContentRecordingSession;
import android.view.Display; import android.view.Display;
@@ -515,12 +516,13 @@ public abstract class WindowManagerInternal {
* Invalidate all visible windows on a given display, and report back on the callback when all * Invalidate all visible windows on a given display, and report back on the callback when all
* windows have redrawn. * windows have redrawn.
* *
* @param callback reporting callback to be called when all windows have redrawn. * @param message The message will be sent when all windows have redrawn. Note that the message
* must be obtained from handler, otherwise it will throw NPE.
* @param timeout calls the callback anyway after the timeout. * @param timeout calls the callback anyway after the timeout.
* @param displayId waits for the windows on the given display, INVALID_DISPLAY to wait for all * @param displayId waits for the windows on the given display, INVALID_DISPLAY to wait for all
* windows on all displays. * windows on all displays.
*/ */
public abstract void waitForAllWindowsDrawn(Runnable callback, long timeout, int displayId); public abstract void waitForAllWindowsDrawn(Message message, long timeout, int displayId);
/** /**
* Overrides the display size. * Overrides the display size.

35
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -601,7 +601,7 @@ public class WindowManagerService extends IWindowManager.Stub
* The callbacks to make when the windows all have been drawn for a given * The callbacks to make when the windows all have been drawn for a given
* {@link WindowContainer}. * {@link WindowContainer}.
*/ */
final HashMap<WindowContainer, Runnable> mWaitingForDrawnCallbacks = new HashMap<>(); final ArrayMap<WindowContainer<?>, Message> mWaitingForDrawnCallbacks = new ArrayMap<>();
/** List of window currently causing non-system overlay windows to be hidden. */ /** List of window currently causing non-system overlay windows to be hidden. */
private ArrayList<WindowState> mHidingNonSystemOverlayWindows = new ArrayList<>(); private ArrayList<WindowState> mHidingNonSystemOverlayWindows = new ArrayList<>();
@@ -5368,8 +5368,6 @@ public class WindowManagerService extends IWindowManager.Stub
public static final int CLIENT_FREEZE_TIMEOUT = 30; public static final int CLIENT_FREEZE_TIMEOUT = 30;
public static final int NOTIFY_ACTIVITY_DRAWN = 32; public static final int NOTIFY_ACTIVITY_DRAWN = 32;
public static final int ALL_WINDOWS_DRAWN = 33;
public static final int NEW_ANIMATOR_SCALE = 34; public static final int NEW_ANIMATOR_SCALE = 34;
public static final int SHOW_EMULATOR_DISPLAY_OVERLAY = 36; public static final int SHOW_EMULATOR_DISPLAY_OVERLAY = 36;
@@ -5491,7 +5489,7 @@ public class WindowManagerService extends IWindowManager.Stub
} }
case WAITING_FOR_DRAWN_TIMEOUT: { case WAITING_FOR_DRAWN_TIMEOUT: {
Runnable callback = null; final Message callback;
final WindowContainer<?> container = (WindowContainer<?>) msg.obj; final WindowContainer<?> container = (WindowContainer<?>) msg.obj;
synchronized (mGlobalLock) { synchronized (mGlobalLock) {
ProtoLog.w(WM_ERROR, "Timeout waiting for drawn: undrawn=%s", ProtoLog.w(WM_ERROR, "Timeout waiting for drawn: undrawn=%s",
@@ -5505,7 +5503,7 @@ public class WindowManagerService extends IWindowManager.Stub
callback = mWaitingForDrawnCallbacks.remove(container); callback = mWaitingForDrawnCallbacks.remove(container);
} }
if (callback != null) { if (callback != null) {
callback.run(); callback.sendToTarget();
} }
break; break;
} }
@@ -5529,17 +5527,6 @@ public class WindowManagerService extends IWindowManager.Stub
} }
break; break;
} }
case ALL_WINDOWS_DRAWN: {
Runnable callback;
final WindowContainer container = (WindowContainer) msg.obj;
synchronized (mGlobalLock) {
callback = mWaitingForDrawnCallbacks.remove(container);
}
if (callback != null) {
callback.run();
}
break;
}
case NEW_ANIMATOR_SCALE: { case NEW_ANIMATOR_SCALE: {
float scale = getCurrentAnimatorScale(); float scale = getCurrentAnimatorScale();
ValueAnimator.setDurationScale(scale); ValueAnimator.setDurationScale(scale);
@@ -6097,7 +6084,8 @@ public class WindowManagerService extends IWindowManager.Stub
if (mWaitingForDrawnCallbacks.isEmpty()) { if (mWaitingForDrawnCallbacks.isEmpty()) {
return; return;
} }
mWaitingForDrawnCallbacks.forEach((container, callback) -> { for (int i = mWaitingForDrawnCallbacks.size() - 1; i >= 0; i--) {
final WindowContainer<?> container = mWaitingForDrawnCallbacks.keyAt(i);
for (int j = container.mWaitingForDrawn.size() - 1; j >= 0; j--) { for (int j = container.mWaitingForDrawn.size() - 1; j >= 0; j--) {
final WindowState win = (WindowState) container.mWaitingForDrawn.get(j); final WindowState win = (WindowState) container.mWaitingForDrawn.get(j);
ProtoLog.i(WM_DEBUG_SCREEN_ON, ProtoLog.i(WM_DEBUG_SCREEN_ON,
@@ -6123,9 +6111,9 @@ public class WindowManagerService extends IWindowManager.Stub
if (container.mWaitingForDrawn.isEmpty()) { if (container.mWaitingForDrawn.isEmpty()) {
ProtoLog.d(WM_DEBUG_SCREEN_ON, "All windows drawn!"); ProtoLog.d(WM_DEBUG_SCREEN_ON, "All windows drawn!");
mH.removeMessages(H.WAITING_FOR_DRAWN_TIMEOUT, container); mH.removeMessages(H.WAITING_FOR_DRAWN_TIMEOUT, container);
mH.sendMessage(mH.obtainMessage(H.ALL_WINDOWS_DRAWN, container)); mWaitingForDrawnCallbacks.removeAt(i).sendToTarget();
} }
}); }
} }
private void traceStartWaitingForWindowDrawn(WindowState window) { private void traceStartWaitingForWindowDrawn(WindowState window) {
@@ -7811,13 +7799,14 @@ public class WindowManagerService extends IWindowManager.Stub
} }
@Override @Override
public void waitForAllWindowsDrawn(Runnable callback, long timeout, int displayId) { public void waitForAllWindowsDrawn(Message message, long timeout, int displayId) {
Objects.requireNonNull(message.getTarget());
final WindowContainer<?> container = displayId == INVALID_DISPLAY final WindowContainer<?> container = displayId == INVALID_DISPLAY
? mRoot : mRoot.getDisplayContent(displayId); ? mRoot : mRoot.getDisplayContent(displayId);
if (container == null) { if (container == null) {
// The waiting container doesn't exist, no need to wait to run the callback. Run and // The waiting container doesn't exist, no need to wait to run the callback. Run and
// return; // return;
callback.run(); message.sendToTarget();
return; return;
} }
boolean allWindowsDrawn = false; boolean allWindowsDrawn = false;
@@ -7834,13 +7823,13 @@ public class WindowManagerService extends IWindowManager.Stub
} }
} }
mWaitingForDrawnCallbacks.put(container, callback); mWaitingForDrawnCallbacks.put(container, message);
mH.sendNewMessageDelayed(H.WAITING_FOR_DRAWN_TIMEOUT, container, timeout); mH.sendNewMessageDelayed(H.WAITING_FOR_DRAWN_TIMEOUT, container, timeout);
checkDrawnWindowsLocked(); checkDrawnWindowsLocked();
} }
} }
if (allWindowsDrawn) { if (allWindowsDrawn) {
callback.run(); message.sendToTarget();
} }
} }