Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc0fc712 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

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

Change-Id: Ia9eb1c6b0302a4d2d3575b10cd190d84333061b2
parents 74842248 19850263

wifi/java/android/net/wifi/WifiManager.java

+2 −1
Original line number Diff line number Diff line
@@ -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