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

Merge "Fix WindowContextTests" into rvc-dev

Browse Source
This commit is contained in:
Charles Chen
2020-04-14 17:44:47 +00:00
committed by Android (Google) Code Review
parent e7eee891b4 7ba8e26c87
commit 5c984b9a09
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/app/WindowTokenClient.java
View File

@@ -67,13 +67,11 @@ public class WindowTokenClient extends IWindowToken.Stub {
} }
final int currentDisplayId = context.getDisplayId(); final int currentDisplayId = context.getDisplayId();
final boolean displayChanged = newDisplayId != currentDisplayId; final boolean displayChanged = newDisplayId != currentDisplayId;
final Configuration config = new Configuration(context.getResources() final Configuration config = context.getResources().getConfiguration();
.getConfiguration()); final boolean configChanged = config.diff(newConfig) != 0;
final boolean configChanged = config.isOtherSeqNewer(newConfig)
&& config.updateFrom(newConfig) != 0;
if (displayChanged || configChanged) { if (displayChanged || configChanged) {
// TODO(ag/9789103): update resource manager logic to track non-activity tokens // TODO(ag/9789103): update resource manager logic to track non-activity tokens
mResourcesManager.updateResourcesForActivity(this, config, newDisplayId, mResourcesManager.updateResourcesForActivity(this, newConfig, newDisplayId,
displayChanged); displayChanged);
} }
if (displayChanged) { if (displayChanged) {

7
services/core/java/com/android/server/wm/WindowToken.java
View File

@@ -422,14 +422,17 @@ class WindowToken extends WindowContainer<WindowState> {
if (!shouldReportToClient()) { if (!shouldReportToClient()) {
return; return;
} }
if (mLastReportedConfig == null) {
mLastReportedConfig = new Configuration();
}
final Configuration config = getConfiguration(); final Configuration config = getConfiguration();
final int displayId = getDisplayContent().getDisplayId(); final int displayId = getDisplayContent().getDisplayId();
if (config.equals(mLastReportedConfig) && displayId == mLastReportedDisplay) { if (config.diff(mLastReportedConfig) == 0 && displayId == mLastReportedDisplay) {
// No changes since last reported time. // No changes since last reported time.
return; return;
} }
mLastReportedConfig = config; mLastReportedConfig.setTo(config);
mLastReportedDisplay = displayId; mLastReportedDisplay = displayId;
IWindowToken windowTokenClient = IWindowToken.Stub.asInterface(token); IWindowToken windowTokenClient = IWindowToken.Stub.asInterface(token);