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

Commit df0b51b6 authored by Zach Johnson's avatar Zach Johnson Committed by Gerrit Code Review
Browse files

Merge changes I8940a1a8,Ia1fb7337,I0a05cac0,Ia1e38281,Ia0195ccc, ... 

* changes:
  Migrate some permission checks into the binder
  Simplify checking for the dump permission
  Simplify local mac address permission checking
  Simplify enforcing bluetooth privileged permission
  Simplify checking for BT ADMIN permission
  Simplify BT permission enforcement
parents 7788bf9b ab803394

src/com/android/bluetooth/Utils.java

+30 −0
Original line number Diff line number Diff line
@@ -254,6 +254,36 @@ public final class Utils { 
        Utils.sForegroundUserId = uid;

    }



    public static void enforceBluetoothPermission(Context context) {

        context.enforceCallingOrSelfPermission(

                android.Manifest.permission.BLUETOOTH,

                "Need BLUETOOTH permission");

    }



    public static void enforceBluetoothAdminPermission(Context context) {

        context.enforceCallingOrSelfPermission(

                android.Manifest.permission.BLUETOOTH_ADMIN,

                "Need BLUETOOTH ADMIN permission");

    }



    public static void enforceBluetoothPrivilegedPermission(Context context) {

        context.enforceCallingOrSelfPermission(

                android.Manifest.permission.BLUETOOTH_PRIVILEGED,

                "Need BLUETOOTH PRIVILEGED permission");

    }



    public static void enforceLocalMacAddressPermission(Context context) {

        context.enforceCallingOrSelfPermission(

                android.Manifest.permission.LOCAL_MAC_ADDRESS,

                "Need LOCAL_MAC_ADDRESS permission");

    }



    public static void enforceDumpPermission(Context context) {

        context.enforceCallingOrSelfPermission(

                android.Manifest.permission.DUMP,

                "Need DUMP permission");

    }



    public static boolean checkCaller() {

        int callingUser = UserHandle.getCallingUserId();

        int callingUid = Binder.getCallingUid();

src/com/android/bluetooth/btservice/AdapterService.java

+92 −83

File changed.

Preview size limit exceeded, changes collapsed.