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

Commit 2addb05c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Move permission enforcement to onCommand" into sc-dev am: fe219c96 am: ed06e1d6 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14958560

Change-Id: I598994cd6c2842357bfe8c88e8160124d6c57606
parents 8d524dd1 ed06e1d6

services/core/java/com/android/server/location/contexthub/ContextHubShellCommand.java

+5 −3
Original line number Diff line number Diff line
@@ -32,16 +32,18 @@ public class ContextHubShellCommand extends ShellCommand { 


    // Internal service impl -- must perform security checks before touching.

    private final ContextHubService mInternal;

    private final Context mContext;



    public ContextHubShellCommand(Context context, ContextHubService service) {

        mInternal = service;



        context.enforceCallingOrSelfPermission(

                android.Manifest.permission.ACCESS_CONTEXT_HUB, "ContextHubShellCommand");

        mContext = context;

    }



    @Override

    public int onCommand(String cmd) {

        mContext.enforceCallingOrSelfPermission(

                android.Manifest.permission.ACCESS_CONTEXT_HUB, "ContextHubShellCommand");



        if ("deny".equals(cmd)) {

            return runDisableAuth();

        }