tree 9ac8eb373c88a68a60f3a2d81a876e1d930619fc
parent c23ee579ac21f1f67a30d75e8ac7cbd49ba2fe7d
author Jake Hamby <jhamby@google.com> 1381275076 -0700
committer Jake Hamby <jhamby@google.com> 1381275076 -0700

Fix NPE in CallerInfo.getCurrentCountryIso().

Internal method CallerInfo.getCurrentCountryIso() can throw NPE
if the country detector's detectCountry() method returns null.
Add code to check that the Country is not null before calling
getCountryIso() on it. Change fallback logic to call
locale.getCountry() whenever countryIso was not assigned.

Bug: 10607906
Change-Id: I08fe3f4d942f67c37a2e6ff0b067fe32ad8a6fa5