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

Commit 35088441 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Consistent dump() permission checking. 

am: dec018bb

Change-Id: I300f8bc07e1266b9e78f56d085cd458862176a85
parents 24647c4b dec018bb

service/java/com/android/server/bluetooth/BluetoothManagerService.java

+2 −1
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ import android.provider.Settings; 
import android.provider.Settings.SettingNotFoundException;

import android.util.Slog;



import com.android.internal.util.DumpUtils;

import com.android.server.pm.PackageManagerService;



import java.io.FileDescriptor;
@@ -2084,7 +2085,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 


    @Override

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

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

        if (!DumpUtils.checkDumpPermission(mContext, TAG, writer)) return;

        String errorMsg = null;



        boolean protoOut = (args.length > 0) && args[0].startsWith("--proto");