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" am: 891422900d am: e4b2d05705

Browse Source 
am: beec6d629a

Change-Id: I21a935cb8272473254a95729f39b77c84ff8ea89
This commit is contained in:
Roshan Pius
2019-06-18 22:50:14 -07:00
committed by android-build-merger
parent 3a8dbbe2e2 beec6d629a
commit 64ec075206
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

@@ -486,7 +486,9 @@ public class NetworkStackClient {
private void requestConnector(@NonNull NetworkStackCallback request) {
// TODO: PID check.
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)) {
// Don't even attempt to obtain the connector and give a nice error message
throw new SecurityException(