diff options
| author | 2019-06-18 23:26:42 -0700 | |
|---|---|---|
| committer | 2019-06-18 23:26:42 -0700 | |
| commit | 68d068d41c1191311c67342a574982108c5da0e3 (patch) | |
| tree | a237411f0dd510e4dbb41b14acf681ac11090892 | |
| parent | 0593c370985ffe5f605c9f18de10c5196e5a129e (diff) | |
| parent | 64ec075206cc4da5fcf3f6c28de724957a174a65 (diff) | |
Merge "NetworkStackClient: Allow modules with network_stack uid" am: 891422900d am: e4b2d05705 am: beec6d629a
am: 64ec075206
Change-Id: I10c48fe9a926fd14f84cd1bfb434ac0286b39bd4
| -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( |