summaryrefslogtreecommitdiffstats
path: root/service/java
diff options
context:
space:
mode:
authorRoshan Pius <rpius@google.com>2019-08-13 11:23:28 -0700
committerRoshan Pius <rpius@google.com>2019-08-14 05:18:14 +0000
commit949a9784e43720aaf3710589565ef5d8e22e20ab (patch)
tree29d162b85f40f7c809190d20ac34a168f7531674 /service/java
parent5958cb78a16829a405c24bf8f642becd8cc81cb0 (diff)
downloadandroid_frameworks_opt_net_wifi-949a9784e43720aaf3710589565ef5d8e22e20ab.tar.gz
android_frameworks_opt_net_wifi-949a9784e43720aaf3710589565ef5d8e22e20ab.tar.bz2
android_frameworks_opt_net_wifi-949a9784e43720aaf3710589565ef5d8e22e20ab.zip
WifiServiceImpl: Allow setWifiEnabled for system apps
This allows system apps to toggle wifi on/off during emergency calls to get user's location for example. Bug: 138091278 Test: atest com.android.server.wifi Change-Id: I095f9755c60034064e467dedcdb16b33dc63d9eb Merged-In: I095f9755c60034064e467dedcdb16b33dc63d9eb (cherry-picked from b46e815669ba3f376f7dda2a24479f84bad0b4a8)
Diffstat (limited to 'service/java')
-rw-r--r--service/java/com/android/server/wifi/WifiServiceImpl.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/service/java/com/android/server/wifi/WifiServiceImpl.java b/service/java/com/android/server/wifi/WifiServiceImpl.java
index b25a84593..cf5dcea97 100644
--- a/service/java/com/android/server/wifi/WifiServiceImpl.java
+++ b/service/java/com/android/server/wifi/WifiServiceImpl.java
@@ -875,7 +875,8 @@ public class WifiServiceImpl extends BaseWifiService {
}
boolean isPrivileged = isPrivileged(Binder.getCallingPid(), Binder.getCallingUid());
if (!isPrivileged
- && !mWifiPermissionsUtil.isTargetSdkLessThan(packageName, Build.VERSION_CODES.Q)) {
+ && !mWifiPermissionsUtil.isTargetSdkLessThan(packageName, Build.VERSION_CODES.Q)
+ && !isSystem(packageName)) {
mLog.info("setWifiEnabled not allowed for uid=%")
.c(Binder.getCallingUid()).flush();
return false;