diff options
| author | Roshan Pius <rpius@google.com> | 2019-04-03 14:02:24 -0700 |
|---|---|---|
| committer | Roshan Pius <rpius@google.com> | 2019-04-03 14:25:45 -0700 |
| commit | 8b00b3e7a43e967259222f915cb66edad83c6313 (patch) | |
| tree | 9e2bb5d52fc271946745cf067b56a1da851e4538 /service | |
| parent | e9d2b772127293d4f36ef9e2727b3ceb97ea69af (diff) | |
WifiService: Remove setWifiEnabled exception for car dock app
Bug: 121046553
Bug: 129549163
Test: atest com.android.server.wifi
Change-Id: I93c8b0b3c8cc4fe23b67cf5a5701e63e81e7003a
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiServiceImpl.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/service/java/com/android/server/wifi/WifiServiceImpl.java b/service/java/com/android/server/wifi/WifiServiceImpl.java index 88bd3a865..5a5bc1824 100644 --- a/service/java/com/android/server/wifi/WifiServiceImpl.java +++ b/service/java/com/android/server/wifi/WifiServiceImpl.java @@ -879,9 +879,7 @@ public class WifiServiceImpl extends BaseWifiService { } boolean isPrivileged = isPrivileged(Binder.getCallingPid(), Binder.getCallingUid()); if (!isPrivileged - && !mWifiPermissionsUtil.isTargetSdkLessThan(packageName, Build.VERSION_CODES.Q) - // Default car dock app is allowed to turn on wifi (but, cannot turn off) - && !(isDefaultCarDock(packageName) && enable)) { + && !mWifiPermissionsUtil.isTargetSdkLessThan(packageName, Build.VERSION_CODES.Q)) { mLog.info("setWifiEnabled not allowed for uid=%") .c(Binder.getCallingUid()).flush(); return false; |