OSDN Git Service

Ensure we apply override configuration to the global one.
authorRobert Carr <racarr@google.com>
Tue, 1 Mar 2016 00:24:33 +0000 (16:24 -0800)
committerRobert Carr <racarr@google.com>
Thu, 3 Mar 2016 19:53:38 +0000 (11:53 -0800)
commitc24d8f9c48b00530b2ca057d15b00d4306949daf
tree9b074f8cdd3110c96b8ba57265bda3b9f60c2715
parent6e18c5edb5494c4889f9910a8679872df5fa4d6e
Ensure we apply override configuration to the global one.

We are confusing clients by sending the correctly merged
override and global configurations through the primary
ActivityManager channel but then sending only
the global configuration through the window manager channels
ensure we always merge the configurations prior to sending
them to the client.

Bug: 26454664
Change-Id: I7183365e1c414f9a68564338c60e2f5283ddb57d
services/core/java/com/android/server/wm/WindowState.java