From ef5b582f796ebd665c3267ba25de0bbb0dfc83a9 Mon Sep 17 00:00:00 2001
From: David Su <dysu@google.com>
Date: Mon, 9 Mar 2020 16:07:50 -0700
Subject: [PATCH] WifiManager.getCountryCode(): Change permission to
 NETWORK_SETTINGS

Previously, the documented permission was
CONNECTIVITY_INTERNAL, which has been deprecated.
The permission that was actually being checked was
NETWORK_STACK. However, since this API is only
called by Settings, NETWORK_SETTINGS is a more
appropriate permission.

Bug: 151091657
Test: compiles
Test: Start Soft AP
Change-Id: Ib68ed714471dbbb0367a1e3852144fb1affbccb0
---
 api/system-current.txt                      | 2 +-
 wifi/java/android/net/wifi/WifiManager.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/api/system-current.txt b/api/system-current.txt
index bbb7927a98f07..0b9e70474e136 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -7331,7 +7331,7 @@ package android.net.wifi {
     method @RequiresPermission(android.Manifest.permission.CONNECTIVITY_INTERNAL) public void factoryReset();
     method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD, android.Manifest.permission.NETWORK_STACK}) public void forget(int, @Nullable android.net.wifi.WifiManager.ActionListener);
     method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public java.util.List<android.util.Pair<android.net.wifi.WifiConfiguration,java.util.Map<java.lang.Integer,java.util.List<android.net.wifi.ScanResult>>>> getAllMatchingWifiConfigs(@NonNull java.util.List<android.net.wifi.ScanResult>);
-    method @Nullable @RequiresPermission(android.Manifest.permission.CONNECTIVITY_INTERNAL) public String getCountryCode();
+    method @Nullable @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public String getCountryCode();
     method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public android.net.Network getCurrentNetwork();
     method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public String[] getFactoryMacAddresses();
     method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public java.util.Map<android.net.wifi.hotspot2.OsuProvider,java.util.List<android.net.wifi.ScanResult>> getMatchingOsuProviders(@Nullable java.util.List<android.net.wifi.ScanResult>);
diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java
index 9703fa61ea23b..930e3942ef3cb 100644
--- a/wifi/java/android/net/wifi/WifiManager.java
+++ b/wifi/java/android/net/wifi/WifiManager.java
@@ -2826,7 +2826,7 @@ public class WifiManager {
      */
     @Nullable
     @SystemApi
-    @RequiresPermission(android.Manifest.permission.CONNECTIVITY_INTERNAL)
+    @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS)
     public String getCountryCode() {
         try {
             return mService.getCountryCode();