From d8d7cbce404a262e453ce7d5beb2706410fa9734 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Tue, 13 Aug 2019 11:23:28 -0700 Subject: 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) (cherry picked from commit 949a9784e43720aaf3710589565ef5d8e22e20ab) Change-Id: I57f11cb4545e6d6845504171ab37b737f0d1ec29 --- service/java/com/android/server/wifi/WifiServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'service') diff --git a/service/java/com/android/server/wifi/WifiServiceImpl.java b/service/java/com/android/server/wifi/WifiServiceImpl.java index 6bb36b3b9..a4639924b 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; -- cgit v1.2.3