| commit | c24d8f9c48b00530b2ca057d15b00d4306949daf | [log] [tgz] |
|---|---|---|
| author | Robert Carr <racarr@google.com> | Mon Feb 29 16:24:33 2016 -0800 |
| committer | Robert Carr <racarr@google.com> | Thu Mar 03 11:53:38 2016 -0800 |
| tree | 9b074f8cdd3110c96b8ba57265bda3b9f60c2715 | |
| parent | 6e18c5edb5494c4889f9910a8679872df5fa4d6e [diff] |
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