summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Su <dysu@google.com>2020-03-10 21:24:51 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-03-10 21:24:51 +0000
commit4ec33363089faf54b56253f6b32f05bd309ef117 (patch)
tree98bb6a7ca10c689dbadd47ca7ecc4de1eb217b2e
parentaa3501495ff4ec96d2c8e894c6d4db4ceaf66550 (diff)
parent0b7409243bc82b767df334a39605e4f437ea3762 (diff)
Merge "WifiManager.getCountryCode(): check NETWORK_SETTINGS permission instead" into rvc-dev
-rw-r--r--service/java/com/android/server/wifi/WifiServiceImpl.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/service/java/com/android/server/wifi/WifiServiceImpl.java b/service/java/com/android/server/wifi/WifiServiceImpl.java
index 16d1c42c5..1b979dc27 100644
--- a/service/java/com/android/server/wifi/WifiServiceImpl.java
+++ b/service/java/com/android/server/wifi/WifiServiceImpl.java
@@ -2830,7 +2830,7 @@ public class WifiServiceImpl extends BaseWifiService {
*/
@Override
public String getCountryCode() {
- enforceNetworkStackPermission();
+ enforceNetworkSettingsPermission();
if (mVerboseLoggingEnabled) {
mLog.info("getCountryCode uid=%").c(Binder.getCallingUid()).flush();
}