summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author David Su <dysu@google.com> 2020-03-04 01:50:55 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2020-03-04 01:50:55 +0000
commit19850263153a7e1616f270c567b243bafcf76cc8 (patch)
treedd0a217bd4fec862a8526d5b6f6b2cc12e5cf7dd
parent4401b0db115a4250f9b4f66374263504bfc4ba90 (diff)
parent229e2881942a791a99721dda56ceb549519f9f08 (diff)
Merge "WifiManager#getCountryCode: clarify doc on return format" into rvc-dev
-rw-r--r--wifi/java/android/net/wifi/WifiManager.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java
index a262c92b8b29..c46cd11f7aae 100644
--- 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