Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "NetworkStackClient: Allow modules with network_stack uid"

Browse Source
This commit is contained in:
Treehugger Robot
2019-06-19 02:21:19 +00:00
committed by Gerrit Code Review
parent 1adf5f0407 4c854cfb8e
commit 891422900d
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/net/java/android/net/NetworkStackClient.java
View File

@@ -488,7 +488,9 @@ public class NetworkStackClient {
private void requestConnector(@NonNull NetworkStackCallback request) { private void requestConnector(@NonNull NetworkStackCallback request) {
// TODO: PID check. // TODO: PID check.
final int caller = Binder.getCallingUid(); final int caller = Binder.getCallingUid();
if (caller != Process.SYSTEM_UID && !UserHandle.isSameApp(caller, Process.BLUETOOTH_UID) if (caller != Process.SYSTEM_UID
&& caller != Process.NETWORK_STACK_UID
&& !UserHandle.isSameApp(caller, Process.BLUETOOTH_UID)
&& !UserHandle.isSameApp(caller, Process.PHONE_UID)) { && !UserHandle.isSameApp(caller, Process.PHONE_UID)) {
// Don't even attempt to obtain the connector and give a nice error message // Don't even attempt to obtain the connector and give a nice error message
throw new SecurityException( throw new SecurityException(