diff options
author | Tiger Huang <tigerhuang@google.com> | 2020-09-23 01:19:19 +0800 |
---|---|---|
committer | Tiger Huang <tigerhuang@google.com> | 2020-09-28 02:04:21 +0800 |
commit | a9b8fa272c737f9e9af81b2fa3f70d7530976d03 (patch) | |
tree | adab921d48a5ba92e89f11c1c326610319f4b3fc /apct-tests | |
parent | a7c40017ffea056c30143a40f350a800fdef228b (diff) |
Remove redundant logic about System UI visibility
This CL removes
- mSeq
- System UI flags used to communicate between WMS and System UI
- redundant AIDL methods
- redundant fields and methods
- redundant tests
- PolicyControl
This CL also
- refines the format in DisplayPolicy#dump
- sends a boolean to InputManager to indicate if System UI is in a low
profile mode instead of sending the legacy system UI visibility
Bug: 149813814
Fix: 169105126
Test: presubmit
Test: dumpsys window displays
Test: See if the layout of ImmersiveModeConfirmation is as expected
Change-Id: I8c8df509355bebc9b560af57d5458614557bcd2f
Diffstat (limited to 'apct-tests')
-rw-r--r-- | apct-tests/perftests/windowmanager/src/android/wm/RelayoutPerfTest.java | 3 | ||||
-rw-r--r-- | apct-tests/perftests/windowmanager/src/android/wm/WindowAddRemovePerfTest.java | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/apct-tests/perftests/windowmanager/src/android/wm/RelayoutPerfTest.java b/apct-tests/perftests/windowmanager/src/android/wm/RelayoutPerfTest.java index a701f8631969..ecd149989ce6 100644 --- a/apct-tests/perftests/windowmanager/src/android/wm/RelayoutPerfTest.java +++ b/apct-tests/perftests/windowmanager/src/android/wm/RelayoutPerfTest.java @@ -139,7 +139,6 @@ public class RelayoutPerfTest extends WindowManagerPerfTestBase final IntSupplier mViewVisibility; - int mSeq; int mFrameNumber; int mFlags; @@ -156,7 +155,7 @@ public class RelayoutPerfTest extends WindowManagerPerfTestBase void runBenchmark(BenchmarkState state) throws RemoteException { final IWindowSession session = WindowManagerGlobal.getWindowSession(); while (state.keepRunning()) { - session.relayout(mWindow, mSeq, mParams, mWidth, mHeight, + session.relayout(mWindow, mParams, mWidth, mHeight, mViewVisibility.getAsInt(), mFlags, mFrameNumber, mOutFrames, mOutMergedConfiguration, mOutSurfaceControl, mOutInsetsState, mOutControls, mOutSurfaceSize, mOutBlastSurfaceControl); diff --git a/apct-tests/perftests/windowmanager/src/android/wm/WindowAddRemovePerfTest.java b/apct-tests/perftests/windowmanager/src/android/wm/WindowAddRemovePerfTest.java index c52b1300aedc..b11d74646d67 100644 --- a/apct-tests/perftests/windowmanager/src/android/wm/WindowAddRemovePerfTest.java +++ b/apct-tests/perftests/windowmanager/src/android/wm/WindowAddRemovePerfTest.java @@ -107,7 +107,7 @@ public class WindowAddRemovePerfTest extends WindowManagerPerfTestBase final InputChannel inputChannel = new InputChannel(); long startTime = SystemClock.elapsedRealtimeNanos(); - session.addToDisplay(this, mSeq, mLayoutParams, View.VISIBLE, + session.addToDisplay(this, mLayoutParams, View.VISIBLE, Display.DEFAULT_DISPLAY, mOutFrame, mOutContentInsets, mOutStableInsets, mOutDisplayCutout, inputChannel, mOutInsetsState, mOutControls); final long elapsedTimeNsOfAdd = SystemClock.elapsedRealtimeNanos() - startTime; |