Merge "WifiManager#getCountryCode: clarify doc on return format" into rvc-dev am: 1985026315 am: dc0fc7120e

Change-Id: I3f3a710e57e48029b00c6cc2bc0bec7816586ebc
2020-03-04 02:05:40 +00:00
parent 81516358c6 dc0fc7120e
commit 18e485a429
1 changed files with 2 additions and 1 deletions
--- a/wifi/java/android/net/wifi/WifiManager.java
+++ b/wifi/java/android/net/wifi/WifiManager.java
@@ -2820,7 +2820,8 @@ public class WifiManager {

    /**
     * Get the country code.
-     * @return the country code in ISO 3166 format, or null if there is no country code configured.
+     * @return the country code in ISO 3166 alpha-2 (2-letter) uppercase format, or null if
+     * there is no country code configured.
     * @hide
     */
    @Nullable