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

Commit 9b6f4fcd authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

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

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

Change-Id: I810fef44b4d5906f9c5a04c18dda354f94c161a6
parents b365864e e650ae24

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