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

Merge "Fix WindowContextTests" into rvc-dev am: 5c984b9a09 am: a903d2fab4 am: 993020db5c

Browse Source 
Change-Id: I2841dc7dec0914b295e8e6bdf75727bd4be92922
This commit is contained in:
Charles Chen
2020-04-14 18:55:51 +00:00
committed by Automerger Merge Worker
parent 1ef3cd545b 993020db5c
commit 9945caaef5
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 boolean displayChanged = newDisplayId != currentDisplayId;
final Configuration config = new Configuration(context.getResources()
.getConfiguration());
final boolean configChanged = config.isOtherSeqNewer(newConfig)
&& config.updateFrom(newConfig) != 0;
final Configuration config = context.getResources().getConfiguration();
final boolean configChanged = config.diff(newConfig) != 0;
if (displayChanged || configChanged) {
// TODO(ag/9789103): update resource manager logic to track non-activity tokens
mResourcesManager.updateResourcesForActivity(this, config, newDisplayId,
mResourcesManager.updateResourcesForActivity(this, newConfig, newDisplayId,
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()) {
return;
}
if (mLastReportedConfig == null) {
mLastReportedConfig = new Configuration();
}
final Configuration config = getConfiguration();
final int displayId = getDisplayContent().getDisplayId();
if (config.equals(mLastReportedConfig) && displayId == mLastReportedDisplay) {
if (config.diff(mLastReportedConfig) == 0 && displayId == mLastReportedDisplay) {
// No changes since last reported time.
return;
}
mLastReportedConfig = config;
mLastReportedConfig.setTo(config);
mLastReportedDisplay = displayId;
IWindowToken windowTokenClient = IWindowToken.Stub.asInterface(token);