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

Remove redundant mFocusedApp from DisplayPolicy

Browse Source 
We don't really use mFocusedApp in DisplayPolicy, but just print it out.
It may confuse the reader because we already have one in DisplayContent.
And these mFocusedApp fields can reference to different apps, because
the one in DisplayPolicy will stop updating while the DisplayPolicy
doesn't have a focused window.

Fix: 141869496
Test: Manual and presubmit
Change-Id: Ic6edbade2af24135ee86d4bd9b6d8965e61fa664
This commit is contained in:
Tiger Huang
2020-02-12 17:34:54 +08:00
parent a000089341
commit c47b26f038
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/wm/DisplayPolicy.java
View File

@@ -145,7 +145,6 @@ import android.util.PrintWriterPrinter;
import android.util.Slog;
import android.view.DisplayCutout;
import android.view.Gravity;
import android.view.IApplicationToken;
import android.view.InputChannel;
import android.view.InputDevice;
import android.view.InputEvent;
@@ -333,8 +332,6 @@ public class DisplayPolicy {
private WindowState mFocusedWindow;
private WindowState mLastFocusedWindow;
IApplicationToken mFocusedApp;
// The states of decor windows from the last layout. These are used to generate another display
// layout in different bounds but with the same states.
private boolean mLastNavVisible;
@@ -3276,7 +3273,6 @@ public class DisplayPolicy {
&& mLastBehavior == behavior
&& mLastFocusIsFullscreen == isFullscreen
&& mLastFocusIsImmersive == isImmersive
&& mFocusedApp == win.getAppToken()
&& mLastNonDockedStackBounds.equals(mNonDockedStackBounds)
&& mLastDockedStackBounds.equals(mDockedStackBounds)) {
return 0;
@@ -3293,7 +3289,6 @@ public class DisplayPolicy {
mLastBehavior = behavior;
mLastFocusIsFullscreen = isFullscreen;
mLastFocusIsImmersive = isImmersive;
mFocusedApp = win.getAppToken();
mLastNonDockedStackBounds.set(mNonDockedStackBounds);
mLastDockedStackBounds.set(mDockedStackBounds);
final Rect fullscreenStackBounds = new Rect(mNonDockedStackBounds);
@@ -3792,9 +3787,6 @@ public class DisplayPolicy {
if (mFocusedWindow != null) {
pw.print(prefix); pw.print("mFocusedWindow="); pw.println(mFocusedWindow);
}
if (mFocusedApp != null) {
pw.print(prefix); pw.print("mFocusedApp="); pw.println(mFocusedApp);
}
if (mTopFullscreenOpaqueWindowState != null) {
pw.print(prefix); pw.print("mTopFullscreenOpaqueWindowState=");
pw.println(mTopFullscreenOpaqueWindowState);