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

Commit 7c8b50c9 authored by Zach Johnson's avatar Zach Johnson
Browse files

Simplify checking for the dump permission 

Bug: 145171640
Test: compile
Change-Id: Ia1fb733716c28c2b56202fac01418c6e9364809e
parent 23e33251

src/com/android/bluetooth/Utils.java

+6 −0
Original line number Diff line number Diff line
@@ -278,6 +278,12 @@ public final class Utils { 
                "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

+2 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static com.android.bluetooth.Utils.enforceBluetoothPermission; 
import static com.android.bluetooth.Utils.enforceBluetoothAdminPermission;

import static com.android.bluetooth.Utils.enforceBluetoothPrivilegedPermission;

import static com.android.bluetooth.Utils.enforceLocalMacAddressPermission;

import static com.android.bluetooth.Utils.enforceDumpPermission;



import android.app.ActivityManager;

import android.app.AlarmManager;
@@ -3218,7 +3219,7 @@ public class AdapterService extends Service { 


    @Override

    protected void dump(FileDescriptor fd, PrintWriter writer, String[] args) {

        enforceCallingOrSelfPermission(android.Manifest.permission.DUMP, TAG);

        enforceDumpPermission(this);



        if (args.length == 0) {

            writer.println("Skipping dump in APP SERVICES, see bluetooth_manager section.");