Merge "Move permission enforcement to onCommand" into sc-dev

    // 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();

        }