| commit | 2c575d24aae064efe7c52566a8c07da72e6d2a7b | [log] [tgz] |
|---|---|---|
| author | Paul Stewart <pstew@chromium.org> | Fri Dec 07 12:28:57 2012 -0800 |
| committer | Gerrit <chrome-bot@google.com> | Mon Dec 10 07:24:42 2012 -0800 |
| tree | fd43a802e0df460808d2ea34aa8772076dc9d942 | |
| parent | 8343f7fdca78ae500f36f0f6e35fb8af11c1b849 [diff] |
shill: Manager: Merge stored configuration in ConfigureService In ConfigureService, if there is already stored information available for a service, merge this stored information into newly created services instead of overriding them with the defaults. This situation can arise when configuration is loaded via policy for a service that is not currently visible. User-specified parameters such as AutoConnect can be lost in this process otherwise. BUG=chromium-os:37042 TEST=Modified unit tests + manual: login to ONC-managed account with WiFi disabled, and ensure configuration is merged (credentials are available in the service although ONC did not provide them). Change-Id: I92cbb7d14dc21c4173794ef1eb19b792d97c44ac Reviewed-on: https://gerrit.chromium.org/gerrit/39398 Commit-Ready: Paul Stewart <pstew@chromium.org> Reviewed-by: Paul Stewart <pstew@chromium.org> Tested-by: Paul Stewart <pstew@chromium.org>