diff options
| author | 2019-06-18 21:31:08 -0700 | |
|---|---|---|
| committer | 2019-06-18 21:31:08 -0700 | |
| commit | beec6d629ab679673c6a3d18d7748f613776952e (patch) | |
| tree | 352e2e035a6bc8f3d1a9e6af0174243894eef030 | |
| parent | 39a565e2181d55e142d0787de9b074912adda7c3 (diff) | |
| parent | e4b2d05705112294a415c2799f7f6c907b4f6323 (diff) | |
Merge "NetworkStackClient: Allow modules with network_stack uid" am: 891422900d
am: e4b2d05705
Change-Id: I63c6ff6e0aa8255d45165fb1d607aa21f9934fcc
| -rw-r--r-- | services/net/java/android/net/NetworkStackClient.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/net/java/android/net/NetworkStackClient.java b/services/net/java/android/net/NetworkStackClient.java index 99da637416c3..56b728c87180 100644 --- a/services/net/java/android/net/NetworkStackClient.java +++ b/services/net/java/android/net/NetworkStackClient.java @@ -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( |