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

Commit 1a0ac241 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by android-build-merger
Browse files

Merge "Fix bluetooth tethering on multi-user" 

am: 4bb4c1a7

Change-Id: I24be143b38bdda59b4cc3037e495f0cb268a2b9f
parents 291e3726 4bb4c1a7

core/java/android/net/NetworkStack.java

+1 −1
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ public class NetworkStack { 
    private void requestConnector(@NonNull NetworkStackCallback request) {

        // TODO: PID check.

        final int caller = Binder.getCallingUid();

        if (caller != Process.SYSTEM_UID && caller != Process.BLUETOOTH_UID) {

        if (caller != Process.SYSTEM_UID && !UserHandle.isSameApp(caller, Process.BLUETOOTH_UID)) {

            // Don't even attempt to obtain the connector and give a nice error message

            throw new SecurityException(

                    "Only the system server should try to bind to the network stack.");

packages/NetworkStack/src/com/android/server/util/PermissionUtil.java

+2 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.server.util; 
import static android.os.Binder.getCallingUid;



import android.os.Process;

import android.os.UserHandle;



/**

 * Utility class to check calling permissions on the network stack.
@@ -32,7 +33,7 @@ public final class PermissionUtil { 
    public static void checkNetworkStackCallingPermission() {

        // TODO: check that the calling PID is the system server.

        final int caller = getCallingUid();

        if (caller != Process.SYSTEM_UID && caller != Process.BLUETOOTH_UID) {

        if (caller != Process.SYSTEM_UID && UserHandle.getAppId(caller) != Process.BLUETOOTH_UID) {

            throw new SecurityException("Invalid caller: " + caller);

        }

    }