Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I810fef44b4d5906f9c5a04c18dda354f94c161a6
This commit is contained in:
Automerger Merge Worker
2020-03-04 02:47:22 +00:00
parent b365864e1b e650ae242e
commit 9b6f4fcde0
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wifi/java/android/net/wifi/WifiManager.java
View File

@@ -2820,7 +2820,8 @@ public class WifiManager {
/** /**
* Get the country code. * 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 * @hide
*/ */
@Nullable @Nullable