Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 68d068d4 authored by Roshan Pius's avatar Roshan Pius Committed by android-build-merger
Browse files

Merge "NetworkStackClient: Allow modules with network_stack uid" am:... 

Merge "NetworkStackClient: Allow modules with network_stack uid" am: 89142290 am: e4b2d057 am: beec6d62
am: 64ec0752

Change-Id: I10c48fe9a926fd14f84cd1bfb434ac0286b39bd4
parents 0593c370 64ec0752

services/net/java/android/net/NetworkStackClient.java

+3 −1
Original line number Original line Diff line number Diff line
@@ -486,7 +486,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(