commit 96cbf09d2430d0f1dc4a06bb62263c56469d63f2
author Sharvil Nanavati <sharvil@google.com> Thu Feb 25 17:52:12 2016 -0800
committer Sharvil Nanavati <sharvil@google.com> Thu Feb 25 18:24:46 2016 -0800
tree 473ab20edfd3cd9dd1d1ffe1ef195f00bf15dda7
parent ba1da4facb5c7086475f310af04d70c09dd22d0d

DO NOT MERGE ANYWHERE Make sure WiFi country code gets set properly.

The current logic forces the country code to be set if it has never
been *attempted* to be set before or if a new country code is being set.
However, it doesn't handle the case where setting the country code with
the driver fails.

This change always forces the country code to be set if it has never
been set for, taking into account potential failures coming back
from the native layer.

Bug: 25208308
Change-Id: Ie0f03e9a16a0f681b2977f4ee19af9339281a9c0